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

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

Thu, 12 Dec 2013 23:22:09 +0000 (10:22 +1100)

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

Thu, 12 Dec 2013 23:22:09 +0000 (10:22 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 12 Dec 2013 23:22:09 +0000 (10:22 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 12 Dec 2013 23:22:09 +0000 (10:22 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/mach-at91/setup.c
Simple merge
diff --cc arch/arm/mach-ux500/setup.h
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 12 Dec 2013 23:22:09 +0000 (10:22 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 12 Dec 2013 23:22:09 +0000 (10:22 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-at91/setup.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/setup.h	patch \|	diff1 \|	diff2 \|	blob \| history