Merge remote-tracking branch 'robh/for-next' into devicetree/next

author Grant Likely <grant.likely@linaro.org>

Mon, 31 Mar 2014 07:10:55 +0000 (08:10 +0100)

committer Grant Likely <grant.likely@linaro.org>

Mon, 31 Mar 2014 07:10:55 +0000 (08:10 +0100)
author Grant Likely <grant.likely@linaro.org>
Mon, 31 Mar 2014 07:10:55 +0000 (08:10 +0100)
committer Grant Likely <grant.likely@linaro.org>
Mon, 31 Mar 2014 07:10:55 +0000 (08:10 +0100)
diff --cc Makefile
Simple merge
diff --cc arch/arm/Kconfig
Simple merge
author	Grant Likely <grant.likely@linaro.org>
	Mon, 31 Mar 2014 07:10:55 +0000 (08:10 +0100)
committer	Grant Likely <grant.likely@linaro.org>
	Mon, 31 Mar 2014 07:10:55 +0000 (08:10 +0100)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history