]> 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, 6 Oct 2011 00:16:07 +0000 (11:16 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 6 Oct 2011 00:16:07 +0000 (11:16 +1100)
commitd4848e9f7cff15acd6745ea866658ed7a6f044ef
tree45222aa7744e75aef5e812781eef5879c829e26e
parenta94e29777a3fda20687217724f7d5eed1d6250c1
parent6b6844dd54e4196dd9818bc63b319f93c37a08be
Merge remote-tracking branch 's5p/for-next'

Conflicts:
drivers/gpio/Makefile
23 files changed:
arch/arm/Kconfig
arch/arm/mach-exynos4/mach-nuri.c
arch/arm/mach-exynos4/mach-universal_c210.c
arch/arm/mach-exynos4/platsmp.c
arch/arm/mach-s3c2410/mach-h1940.c
arch/arm/mach-s3c64xx/cpu.c
arch/arm/mach-s3c64xx/mach-anw6410.c
arch/arm/mach-s3c64xx/mach-crag6410.c
arch/arm/mach-s3c64xx/mach-hmt.c
arch/arm/mach-s3c64xx/mach-mini6410.c
arch/arm/mach-s3c64xx/mach-ncp.c
arch/arm/mach-s3c64xx/mach-real6410.c
arch/arm/mach-s3c64xx/mach-smartq5.c
arch/arm/mach-s3c64xx/mach-smartq7.c
arch/arm/mach-s3c64xx/mach-smdk6400.c
arch/arm/mach-s3c64xx/mach-smdk6410.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