]> 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, 23 Sep 2011 00:25:28 +0000 (10:25 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2011 00:25:28 +0000 (10:25 +1000)
commit39eacb1f426f0de7fa2be2065a736b36bb0fb253
treec90b303c78289bcc41a41adf21a35143ecfee0cd
parent27b9621acc85a2ebeb53e8958ae5a860d0dfe7db
parent979890f7b9bd77e279d58413e80191ef3b3b1fb2
Merge remote-tracking branch 's5p/for-next'

Conflicts:
drivers/gpio/Makefile
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-s3c64xx/mach-crag6410.c
arch/arm/mach-s5pv210/cpu.c
arch/arm/mach-s5pv210/mach-goni.c
drivers/gpio/Kconfig
drivers/gpio/Makefile