From: Shawn Guo Date: Mon, 17 Sep 2012 07:12:28 +0000 (+0800) Subject: Merge tag 'imx-clk-dt-lookup' into imx/dt-for-3.7-2 X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~61^2~6^2~3 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb32b4e0fc53ebd45708dd7aa8d7fa224e97308c;p=pandora-kernel.git Merge tag 'imx-clk-dt-lookup' into imx/dt-for-3.7-2 Conflicts: arch/arm/boot/dts/imx6q.dtsi --- cb32b4e0fc53ebd45708dd7aa8d7fa224e97308c Reading git-diff-tree failed