From: Olof Johansson <olof@lixom.net>
Date: Thu, 13 Sep 2012 06:20:33 +0000 (-0700)
Subject: Merge tag 'imx-clk-dt-lookup' of git://git.linaro.org/people/shawnguo/linux-2.6 into... 
X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~61^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73f5ae3132f8a3f1be76a6d3e76d783defbc22fc;p=pandora-kernel.git

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
---

73f5ae3132f8a3f1be76a6d3e76d783defbc22fc
Reading git-diff-tree failed