Merge branch 'next/devel2' into for-next

author Arnd Bergmann <arnd@arndb.de>

Wed, 2 Nov 2011 02:16:20 +0000 (03:16 +0100)

committer Arnd Bergmann <arnd@arndb.de>

Wed, 2 Nov 2011 02:16:20 +0000 (03:16 +0100)
author Arnd Bergmann <arnd@arndb.de>
Wed, 2 Nov 2011 02:16:20 +0000 (03:16 +0100)
committer Arnd Bergmann <arnd@arndb.de>
Wed, 2 Nov 2011 02:16:20 +0000 (03:16 +0100)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/mach-exynos4/Kconfig
Simple merge
diff --cc arch/arm/mach-exynos4/mach-nuri.c
Simple merge
diff --cc arch/arm/mach-mmp/Makefile
Simple merge
diff --cc arch/arm/mach-mmp/brownstone.c
Simple merge
diff --cc arch/arm/mach-mmp/mmp2.c
Simple merge
author	Arnd Bergmann <arnd@arndb.de>
	Wed, 2 Nov 2011 02:16:20 +0000 (03:16 +0100)
committer	Arnd Bergmann <arnd@arndb.de>
	Wed, 2 Nov 2011 02:16:20 +0000 (03:16 +0100)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos4/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos4/mach-nuri.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/brownstone.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mmp/mmp2.c	patch \|	diff1 \|	diff2 \|	blob \| history