Merge branch 'picoxcell/soc' into next/soc

author Arnd Bergmann <[email protected]>

Wed, 2 Nov 2011 01:46:17 +0000 (02:46 +0100)

committer Arnd Bergmann <[email protected]>

Wed, 2 Nov 2011 01:46:17 +0000 (02:46 +0100)
author Arnd Bergmann <[email protected]>
Wed, 2 Nov 2011 01:46:17 +0000 (02:46 +0100)
committer Arnd Bergmann <[email protected]>
Wed, 2 Nov 2011 01:46:17 +0000 (02:46 +0100)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/Makefile
Simple merge
author	Arnd Bergmann <[email protected]>
	Wed, 2 Nov 2011 01:46:17 +0000 (02:46 +0100)
committer	Arnd Bergmann <[email protected]>
	Wed, 2 Nov 2011 01:46:17 +0000 (02:46 +0100)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history