Russell King 2e0e943436 Merge branch 'devel-stable' into for-linus ... Conflicts: arch/arm/kernel/setup.c arch/arm/mach-shmobile/board-kota2.c		2012-01-05 13:24:33 +00:00
..
include/mach	Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable	2011-12-05 23:27:59 +00:00
clock.c	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2011-11-04 18:02:25 -07:00
cpu.c	Merge branch 'depends/rmk/memory_h' into next/cleanup2	2011-11-01 04:58:59 +01:00
dev-audio.c
dev-spi.c
dma.c	ARM: S5PV210: register the second instance of pl330 DMAC	2011-09-19 10:27:23 +09:00
init.c
Kconfig	Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma	2011-11-04 18:02:25 -07:00
mach-aquila.c	ARM: samsung: convert to MULTI_IRQ_HANDLER	2011-11-15 18:14:04 +00:00
mach-goni.c	ARM: samsung: convert to MULTI_IRQ_HANDLER	2011-11-15 18:14:04 +00:00
mach-smdkc110.c	ARM: samsung: convert to MULTI_IRQ_HANDLER	2011-11-15 18:14:04 +00:00
mach-smdkv210.c	Merge branch 'devel-stable' into for-linus	2012-01-05 13:24:33 +00:00
mach-torbreck.c	ARM: samsung: convert to MULTI_IRQ_HANDLER	2011-11-15 18:14:04 +00:00
Makefile	ARM: S5P: Make the sleep code common for S5P series SoCs	2011-10-04 20:25:51 +09:00
Makefile.boot	ARM: 7022/1: allow to detect conflicting zreladdrs	2011-10-17 09:12:40 +01:00
pm.c	ARM: S5PV210: Fix build warning	2011-08-19 20:57:35 +09:00
setup-fb-24bpp.c
setup-fimc.c
setup-i2c0.c
setup-i2c1.c
setup-i2c2.c
setup-ide.c
setup-keypad.c
setup-sdhci-gpio.c
setup-sdhci.c	ARM: SAMSUNG: remove sdhci default configuration setup platform helper	2011-10-04 19:48:40 +09:00