Merge branches 'highbank/soc' and 'picoxcell/soc' into next/soc

author Arnd Bergmann <arnd@arndb.de>

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

committer Arnd Bergmann <arnd@arndb.de>

Fri, 21 Oct 2011 15:04:21 +0000 (17:04 +0200)
author Arnd Bergmann <arnd@arndb.de>
Fri, 21 Oct 2011 15:04:21 +0000 (17:04 +0200)
committer Arnd Bergmann <arnd@arndb.de>
Fri, 21 Oct 2011 15:04:21 +0000 (17:04 +0200)
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:04:21 +0000 (17:04 +0200)
committer	Arnd Bergmann <arnd@arndb.de>
	Fri, 21 Oct 2011 15:04:21 +0000 (17:04 +0200)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history