Merge tag 'imx-fixes-3.8-4' of git://git.linaro.org/people/shawnguo/l…

…inux-2.6 into fixes

From Shawn Guo:
imx fixes for 3.8, take 4

 - It fixes fec ptp clock pointer in device tree source.

* tag 'imx-fixes-3.8-4' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: dts: imx6: fix fec ptp clock slow 10 time

arch/arm/boot/dts/imx6q.dtsi

@@ -866,7 +866,7 @@
 				compatible = "fsl,imx6q-fec";
 				reg = <0x02188000 0x4000>;
 				interrupts = <0 118 0x04 0 119 0x04>;
-				clocks = <&clks 117>, <&clks 117>, <&clks 177>;
+				clocks = <&clks 117>, <&clks 117>, <&clks 190>;
 				clock-names = "ipg", "ahb", "ptp";
 				status = "disabled";
 			};