From: Shawn Guo <shawn.guo@freescale.com>
Date: Wed, 25 Jun 2014 16:24:43 +0000 (+0800)
Subject: Merge branch 'imx/dt' into for-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7b087756e28d60086798b4877110514e7ee09770;p=karo-tx-linux.git

Merge branch 'imx/dt' into for-next
---

7b087756e28d60086798b4877110514e7ee09770
diff --cc arch/arm/boot/dts/imx6q-gw51xx.dts
index 0e1406e58eff,70f2df71edd2..8e8bcd8fe0fb
--- a/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";
  };