]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 's5p/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Oct 2011 00:46:56 +0000 (11:46 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Oct 2011 00:46:56 +0000 (11:46 +1100)
commitc06f937a9a92f497c8e0dbb923d98b9347200c69
tree7c863cfc621deb8f2bfb1c926a856431b1e814f5
parent88947e30af863866398fdd807512ddb16d3a4123
parent6b6844dd54e4196dd9818bc63b319f93c37a08be
Merge remote-tracking branch 's5p/for-next'

Conflicts:
arch/arm/mach-exynos4/Kconfig
drivers/gpio/Makefile
13 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-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