]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 's5p/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Aug 2011 01:10:25 +0000 (11:10 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Aug 2011 01:10:25 +0000 (11:10 +1000)
Conflicts:
arch/arm/mach-exynos4/Kconfig
arch/arm/mach-exynos4/mach-smdkc210.c

1  2 
arch/arm/mach-exynos4/Kconfig
arch/arm/mach-exynos4/Makefile

Simple merge
Simple merge