Merge tag 'imx-clk-dt-lookup' into imx/dt-for-3.7-2

Conflicts:
	arch/arm/boot/dts/imx6q.dtsi

diff --cc arch/arm/boot/dts/imx6q-sabrelite.dts
Simple merge

diff --cc arch/arm/boot/dts/imx6q.dtsi
index 1d07be2,925da33..e45476d
--- 1/arch/arm/boot/dts/imx6q.dtsi
--- 2/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@@ -362,6 -382,8 +382,7 @@@
                                compatible = "fsl,imx6q-wdt", "fsl,imx21-wdt";
                                reg = <0x020bc000 0x4000>;
                                interrupts = <0 80 0x04>;
 -                              status = "disabled";
+                               clocks = <&clks 0>;
                        };
  
                        wdog@020c0000 { /* WDOG2 */

diff --cc arch/arm/mach-imx/mach-imx6q.c
Simple merge