]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit27bfcb0937471ce603b020a97f7f1f95ab412e3f
tree68b8015b5e0ba3acb69db4f1c458841d327e74fe
parente72a6a71a5e7f4b9ca12141a4d205847893f376e
parent9837a99a4c65864dc74506742c2c52e170ffc0fe
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