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)
commitcb32b4e0fc53ebd45708dd7aa8d7fa224e97308c
tree68b8015b5e0ba3acb69db4f1c458841d327e74fe
parentb1f174b19c15e36a5e6f209d98caba77385d790e
parent0e87e0436c0cc3954eb62181a96d7217ca955a4f
Merge tag 'imx-clk-dt-lookup' into imx/dt-for-3.7-2

Conflicts:
arch/arm/boot/dts/imx6q.dtsi
arch/arm/boot/dts/imx6q-sabrelite.dts
arch/arm/boot/dts/imx6q.dtsi
arch/arm/mach-imx/mach-imx6q.c