Arnd Bergmann cfaf8fc5b5 Merge branch 'depends/rmk/memory_h' into next/cleanup2 ... There are lots of conflicts between the omap and exynos cleanups and the memory.h remove series. Conflicts: arch/arm/mach-exynos4/mach-smdkc210.c arch/arm/mach-exynos4/mach-smdkv310.c arch/arm/mach-imx/mach-cpuimx27.c arch/arm/mach-omap1/board-ams-delta.c arch/arm/mach-omap1/board-generic.c arch/arm/mach-omap1/board-h2.c arch/arm/mach-omap1/board-h3.c arch/arm/mach-omap1/board-nokia770.c arch/arm/mach-omap1/board-osk.c arch/arm/mach-omap1/board-palmte.c arch/arm/mach-omap1/board-palmtt.c arch/arm/mach-omap1/board-palmz71.c arch/arm/mach-omap1/board-sx1.c arch/arm/mach-omap1/board-voiceblue.c arch/arm/mach-omap1/io.c arch/arm/mach-omap2/board-generic.c arch/arm/mach-omap2/io.c arch/arm/plat-omap/io.c Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2011-11-01 04:58:59 +01:00
..
include/mach	Merge branch 'depends/rmk/memory_h' into next/cleanup2	2011-11-01 04:58:59 +01:00
clock.c	Merge branch 'next/topic-dma-pl330-devname-fix' into next/topic-dma-samsung	2011-09-19 10:30:49 +09:00
cpu.c
dev-audio.c
dev-spi.c
dma.c	ARM: S5PC100: register the second instance of pl330 DMAC	2011-09-19 10:27:26 +09:00
init.c
Kconfig	ARM: S5PC100: Use generic DMA PL330 driver	2011-09-14 11:10:03 +05:30
mach-smdkc100.c	Merge branch 'depends/rmk/memory_h' into next/cleanup2	2011-11-01 04:58:59 +01:00
Makefile
Makefile.boot
setup-fb-24bpp.c	ARM: S5PC100: Cleanup mach/regs-fb.h from mach-s5pc100	2011-07-21 02:11:30 +09:00
setup-i2c0.c
setup-i2c1.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