]> 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, 4 Oct 2011 00:37:06 +0000 (11:37 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 00:37:06 +0000 (11:37 +1100)
commit3fd52f75ca270d73ab1c7cd3df57d694f89de292
tree0303a1e36ab24eabcf8988c4586a34673e78b22b
parenta9cd6c91bed9b84f46a69b284dbb301ae0f3e5bb
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