git.maquefel.me Git - linux.git/commit

author	Olof Johansson <olof@lixom.net>
	Thu, 13 Sep 2012 06:20:33 +0000 (23:20 -0700)
committer	Olof Johansson <olof@lixom.net>
	Thu, 13 Sep 2012 06:20:33 +0000 (23:20 -0700)
commit	73f5ae3132f8a3f1be76a6d3e76d783defbc22fc
tree	8718260d692085f4eae3c5b30f2dba15e0af9132	tree \| snapshot
parent	cecb9a1e4dda8a8cb74227b79091edcd62e04674	commit \| diff
parent	0e87e0436c0cc3954eb62181a96d7217ca955a4f	commit \| 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

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

RSS Atom

arch/arm/boot/dts/imx6q-sabrelite.dts	diff1 \|	diff2 \|	blob \| history
arch/arm/boot/dts/imx6q.dtsi	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/clk-imx6q.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-imx6q.c	diff1 \|	diff2 \|	blob \| history