Arnd Bergmann 08cab72f91 Merge branch 'dt/gic' into next/dt ... Conflicts: arch/arm/include/asm/localtimer.h arch/arm/mach-msm/board-msm8x60.c arch/arm/mach-omap2/board-generic.c		2011-10-31 14:08:10 +01:00
..
clock.c	ARM: S3C24XX: Add clkdev support	2011-07-20 19:11:29 +09:00
irq.c	ARM / Samsung: Use struct syscore_ops for "core" power management	2011-04-24 19:16:10 +02:00
Kconfig
mach-smdk2416.c	ARM: mach-s3c24*: convert boot_params to atag_offset	2011-08-21 17:15:09 -04:00
Makefile
pm.c	ARM: pm: allow suspend finisher to return error codes	2011-07-02 09:54:01 +01:00
s3c2416.c	ARM: S3C24XX: Fix s3c24xx build errors if !CONFIG_PM	2011-10-22 04:00:53 +09:00
setup-sdhci-gpio.c
setup-sdhci.c