Merge remote-tracking branch 'imx-mxs/for-next'

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

Tue, 7 Jan 2014 00:02:14 +0000 (11:02 +1100)

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

Tue, 7 Jan 2014 00:02:14 +0000 (11:02 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 7 Jan 2014 00:02:14 +0000 (11:02 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 7 Jan 2014 00:02:14 +0000 (11:02 +1100)
diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge
diff --cc arch/arm/boot/dts/Makefile
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 7 Jan 2014 00:02:14 +0000 (11:02 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 7 Jan 2014 00:02:14 +0000 (11:02 +1100)
		1	2
Documentation/devicetree/bindings/vendor-prefixes.txt	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history