]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 's5p/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 00:26:14 +0000 (11:26 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 00:26:14 +0000 (11:26 +1100)
commita0c44671e532589a572d50f6bb71269b0cba109c
tree0338d98c35ab9fcefcd33826da41f34cb57cb629
parent24eafbcaed31dfad3fc257f3c25c78b5befc99e8
parenteef6487dd3b793427f9255cfbadebdaa41d4a127
Merge remote-tracking branch 's5p/for-next'

Conflicts:
arch/arm/mach-exynos4/Kconfig
drivers/gpio/Makefile
15 files changed:
arch/arm/Kconfig
arch/arm/mach-exynos4/Kconfig
arch/arm/mach-exynos4/mach-nuri.c
arch/arm/mach-exynos4/mach-universal_c210.c
arch/arm/mach-s3c2410/mach-qt2410.c
arch/arm/mach-s3c2440/mach-rx1950.c
arch/arm/mach-s3c64xx/mach-crag6410.c
arch/arm/mach-s5p64x0/cpu.c
arch/arm/mach-s5p64x0/mach-smdk6440.c
arch/arm/mach-s5p64x0/mach-smdk6450.c
arch/arm/mach-s5pv210/cpu.c
arch/arm/mach-s5pv210/mach-goni.c
arch/arm/plat-samsung/Kconfig
drivers/gpio/Kconfig
drivers/gpio/Makefile