Merge branch 'next/soc' into for-next

author Arnd Bergmann <arnd@arndb.de>

Fri, 21 Oct 2011 15:05:35 +0000 (17:05 +0200)

committer Arnd Bergmann <arnd@arndb.de>

Fri, 21 Oct 2011 15:05:35 +0000 (17:05 +0200)
author Arnd Bergmann <arnd@arndb.de>
Fri, 21 Oct 2011 15:05:35 +0000 (17:05 +0200)
committer Arnd Bergmann <arnd@arndb.de>
Fri, 21 Oct 2011 15:05:35 +0000 (17:05 +0200)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/Makefile
Simple merge
author	Arnd Bergmann <arnd@arndb.de>
	Fri, 21 Oct 2011 15:05:35 +0000 (17:05 +0200)
committer	Arnd Bergmann <arnd@arndb.de>
	Fri, 21 Oct 2011 15:05:35 +0000 (17:05 +0200)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history