Merge tag 'imx-clk-dt-lookup' into imx/dt-for-3.7-2
authorShawn Guo <shawn.guo@linaro.org>
Mon, 17 Sep 2012 07:12:28 +0000 (15:12 +0800)
committerShawn Guo <shawn.guo@linaro.org>
Mon, 17 Sep 2012 07:12:28 +0000 (15:12 +0800)
Conflicts:
arch/arm/boot/dts/imx6q.dtsi


Trivial merge