| commit | 73f5ae3132f8a3f1be76a6d3e76d783defbc22fc | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Wed Sep 12 23:20:33 2012 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Wed Sep 12 23:20:33 2012 -0700 |
| tree | 8718260d692085f4eae3c5b30f2dba15e0af9132 | |
| parent | cecb9a1e4dda8a8cb74227b79091edcd62e04674 [diff] | |
| parent | 0e87e0436c0cc3954eb62181a96d7217ca955a4f [diff] |
Merge tag 'imx-clk-dt-lookup' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/dt 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