]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 's5p/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 2 Aug 2011 01:00:43 +0000 (11:00 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 2 Aug 2011 01:00:43 +0000 (11:00 +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