]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 's5p/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 27 Sep 2011 01:29:12 +0000 (11:29 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 27 Sep 2011 01:29:12 +0000 (11:29 +1000)
commit9d951587fc0322b8beb525c3825217734730d6d1
treef4176476f5c97c2cf154c18b1bb433eda493df42
parent7ef88ee371370c228531ce1a8020f96dbf0c314e
parent86490482cd4d06d93b0759ee7706259769fbe31e
Merge remote-tracking branch 's5p/for-next'

Conflicts:
drivers/gpio/Makefile
13 files changed:
arch/arm/Kconfig
arch/arm/mach-exynos4/mach-nuri.c
arch/arm/mach-exynos4/mach-smdkv310.c
arch/arm/mach-exynos4/mach-universal_c210.c
arch/arm/mach-s3c2410/mach-h1940.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
drivers/gpio/Kconfig
drivers/gpio/Makefile