Merge tag 'imx-clk-dt-lookup' of git://git.linaro.org/people/shawnguo/linux-2.6 into...

It replaces the clk_register_clkdev in imx6q clock driver with DT
lookup.  It depends on Mike's clk-3.7 branch.

* tag 'imx-clk-dt-lookup' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: imx6q: replace clk_register_clkdev with clock DT lookup

Resolved context add/remove conflict in 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 1d07be2530b5610cbbb35fe65fa6057b5130cb5e,925da33420e2d0c405a77defcdde8b096994f494..e45476dc6d32a61599054de95b44eca66e433ec8
--- 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/clk-imx6q.c
Simple merge

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