]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'imx-mxs/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 5 Jan 2014 23:47:17 +0000 (10:47 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 5 Jan 2014 23:47:17 +0000 (10:47 +1100)
commit354eee9481dac8f14074fa9e8a88da0dc05206ba
treee8b5597366c2d062beb4621b8c905f4ec6924684
parent1e46de556728389b658d0859b80f52633e89a763
parent52bfd188eccf69ee90d8279bccfbb041c9165080
Merge remote-tracking branch 'imx-mxs/for-next'

Conflicts:
arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi
arch/arm/boot/dts/imx51-apf51.dts
arch/arm/boot/dts/imx6q-sabrelite.dts
21 files changed:
Documentation/devicetree/bindings/vendor-prefixes.txt
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/imx27.dtsi
arch/arm/boot/dts/imx28-apf28dev.dts
arch/arm/boot/dts/imx28-cfa10037.dts
arch/arm/boot/dts/imx28-cfa10049.dts
arch/arm/boot/dts/imx28-cfa10057.dts
arch/arm/boot/dts/imx28-cfa10058.dts
arch/arm/boot/dts/imx28-evk.dts
arch/arm/boot/dts/imx28-m28cu3.dts
arch/arm/boot/dts/imx28.dtsi
arch/arm/boot/dts/imx51.dtsi
arch/arm/boot/dts/imx53-evk.dts
arch/arm/boot/dts/imx53-mba53.dts
arch/arm/boot/dts/imx53-qsb.dts
arch/arm/boot/dts/imx53-smd.dts
arch/arm/boot/dts/imx53.dtsi
arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi
arch/arm/boot/dts/imx6qdl-sabresd.dtsi
arch/arm/boot/dts/imx6qdl-wandboard.dtsi
arch/arm/boot/dts/imx6qdl.dtsi