Merge remote-tracking branch 'arm-soc/for-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Wed, 24 Oct 2012 02:42:43 +0000 (13:42 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Wed, 24 Oct 2012 02:42:43 +0000 (13:42 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 24 Oct 2012 02:42:43 +0000 (13:42 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 24 Oct 2012 02:42:43 +0000 (13:42 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/Makefile
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 24 Oct 2012 02:42:43 +0000 (13:42 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 24 Oct 2012 02:42:43 +0000 (13:42 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history