Merge branch 'imx/dt' into for-next

diff --cc arch/arm/boot/dts/imx6q-gw51xx.dts
index 0e1406e58eff1d73a3601d09858147fecbb1b9e0,70f2df71edd2fca9ec7808c05b57abfba0bcbaae..8e8bcd8fe0fb1c11dc63c5b58760ab1768919510
--- 1/arch/arm/boot/dts/imx6q-gw51xx.dts
--- 2/arch/arm/boot/dts/imx6q-gw51xx.dts
+++ b/arch/arm/boot/dts/imx6q-gw51xx.dts
@@@ -11,9 -11,9 +11,9 @@@
  
  /dts-v1/;
  #include "imx6q.dtsi"
 -#include "imx6qdl-gw54xx.dtsi"
 +#include "imx6qdl-gw51xx.dtsi"
  
  / {
-       model = "Gateworks Ventana i.MX6 Quad GW51XX";
+       model = "Gateworks Ventana i.MX6 Dual/Quad GW51XX";
        compatible = "gw,imx6q-gw51xx", "gw,ventana", "fsl,imx6q";
  };

diff --cc arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
Simple merge

diff --cc arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
Simple merge