Arnd Bergmann a07613a54d Merge branch 'samsung/dt' into samsung/cleanup ... Conflicts: arch/arm/mach-s3c64xx/Makefile arch/arm/mach-s5pc100/Makefile arch/arm/mach-s5pv210/Makefile Pull in previously resolved conflicts: The Makefiles were reorganized in the "rmk/restart" series and modified in the "samsung/cleanup series". This also pulls in the other conflict resolutions from the restart series against the samsung/dt series. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-01-09 16:01:00 +00:00
..
clock.c	ARM: SAMSUNG: Add lookup of sdhci-s3c clocks using generic names	2011-12-23 10:09:16 +09:00
irq.c	ARM / Samsung: Use struct syscore_ops for "core" power management	2011-04-24 19:16:10 +02:00
Kconfig	ARM: SAMSUNG: Remove useless Samsung GPIO related CONFIGs	2011-09-21 15:07:05 +09:00
mach-smdk2416.c	ARM: 7254/1: restart: S3C24XX: move SWRST based S3C platforms to	2012-01-05 12:57:18 +00:00
Makefile	ARM: SAMSUNG: Remove SDHCI bus clocks from platform data	2011-12-23 10:09:10 +09:00
pm.c	ARM: pm: allow suspend finisher to return error codes	2011-07-02 09:54:01 +01:00
s3c2416.c	ARM: 7254/1: restart: S3C24XX: move SWRST based S3C platforms to	2012-01-05 12:57:18 +00:00
setup-sdhci-gpio.c	ARM: S3C2416: Add platform helpers for setup SDHCI	2011-01-06 14:09:18 +09:00