Skip to content
Commit cb32b4e0 authored by Shawn Guo's avatar Shawn Guo
Browse files

Merge tag 'imx-clk-dt-lookup' into imx/dt-for-3.7-2 

Conflicts:
	arch/arm/boot/dts/imx6q.dtsi
parents b1f174b1 0e87e043
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment