Merge remote-tracking branch 'shesselba/clk-of-init-v2_for-3.13' into imx/soc

author Shawn Guo <shawn.guo@linaro.org>

Mon, 21 Oct 2013 01:10:56 +0000 (09:10 +0800)

committer Shawn Guo <shawn.guo@linaro.org>

Mon, 21 Oct 2013 01:10:56 +0000 (09:10 +0800)
author Shawn Guo <shawn.guo@linaro.org>
Mon, 21 Oct 2013 01:10:56 +0000 (09:10 +0800)
committer Shawn Guo <shawn.guo@linaro.org>
Mon, 21 Oct 2013 01:10:56 +0000 (09:10 +0800)
diff --cc arch/arm/mach-imx/clk-imx51-imx53.c
Simple merge
diff --cc arch/arm/mach-imx/mach-imx6q.c
Simple merge
author	Shawn Guo <shawn.guo@linaro.org>
	Mon, 21 Oct 2013 01:10:56 +0000 (09:10 +0800)
committer	Shawn Guo <shawn.guo@linaro.org>
	Mon, 21 Oct 2013 01:10:56 +0000 (09:10 +0800)
		1	2
arch/arm/mach-imx/clk-imx51-imx53.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-imx/mach-imx6q.c	patch \|	diff1 \|	diff2 \|	blob \| history