Merge branch 'omap-for-v4.1/dt-v2' into for-next

author Tony Lindgren <tony@atomide.com>

Tue, 17 Mar 2015 18:27:34 +0000 (11:27 -0700)

committer Tony Lindgren <tony@atomide.com>

Tue, 17 Mar 2015 18:27:34 +0000 (11:27 -0700)
author Tony Lindgren <tony@atomide.com>
Tue, 17 Mar 2015 18:27:34 +0000 (11:27 -0700)
committer Tony Lindgren <tony@atomide.com>
Tue, 17 Mar 2015 18:27:34 +0000 (11:27 -0700)
diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
Simple merge
diff --cc arch/arm/boot/dts/dra7-evm.dts
Simple merge
diff --cc arch/arm/boot/dts/dra72-evm.dts
Simple merge
diff --cc arch/arm/boot/dts/dra7xx-clocks.dtsi
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Tue, 17 Mar 2015 18:27:34 +0000 (11:27 -0700)
committer	Tony Lindgren <tony@atomide.com>
	Tue, 17 Mar 2015 18:27:34 +0000 (11:27 -0700)
		1	2
Documentation/devicetree/bindings/vendor-prefixes.txt	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/dra7-evm.dts	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/dra72-evm.dts	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/dra7xx-clocks.dtsi	patch \|	diff1 \|	diff2 \|	blob \| history