]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 's5p/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Nov 2011 02:16:41 +0000 (13:16 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Nov 2011 02:16:41 +0000 (13:16 +1100)
Conflicts:
arch/arm/mach-exynos4/Kconfig
drivers/gpio/Makefile

1  2 
arch/arm/mach-exynos4/Kconfig

Simple merge