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
..
clock.c	ARM: S3C24XX: Add clkdev support	2011-07-20 19:11:29 +09:00
cpu-freq.c	ARM: S3C: CPUFREQ: Add debugfs support for cpufreq	2009-07-30 23:22:56 +01:00
dma.c	Merge branch 'next-samsung-devel' into next-samsung-devel-2	2011-10-04 20:18:36 +09:00
gpio.c	ARM: SAMSUNG: Update the name of regarding Samsung GPIO	2011-09-21 15:07:04 +09:00
irq.c	ARM / Samsung: Use struct syscore_ops for "core" power management	2011-04-24 19:16:10 +02:00
Kconfig	gpio/s3c24xx: move gpio driver into drivers/gpio/	2011-09-21 10:52:22 +09:00
mach-jive.c	ARM: mach-s3c24*: convert boot_params to atag_offset	2011-08-21 17:15:09 -04:00
mach-smdk2413.c	ARM: mach-s3c24*: convert boot_params to atag_offset	2011-08-21 17:15:09 -04:00
mach-vstms.c	ARM: mach-s3c24*: convert boot_params to atag_offset	2011-08-21 17:15:09 -04:00
Makefile	gpio/s3c24xx: move gpio driver into drivers/gpio/	2011-09-21 10:52:22 +09:00
pm.c	ARM: pm: allow suspend finisher to return error codes	2011-07-02 09:54:01 +01:00
s3c2412.c	ARM / Samsung: Use struct syscore_ops for "core" power management	2011-04-24 19:16:10 +02:00
sleep.S	[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach	2008-08-07 09:55:48 +01:00