]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 's5p/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 Sep 2011 00:11:31 +0000 (10:11 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 30 Sep 2011 00:11:31 +0000 (10:11 +1000)
commitb5afbb68c6471d43e641dc9cb8ef9cfb582e2043
treeba43a2780e08b1eb48259cd0a74db56e733b3eef
parentaaf953f25cc40a9e5313f25ef67ecd7e46d03890
parent3ef6bf53b012fbc3b335b2595bb15b969daeebf4
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