From: Arnd Bergmann Date: Sat, 12 May 2012 22:11:06 +0000 (+0200) Subject: Merge branch 'spear/clock' into next/clock X-Git-Tag: v3.5-rc1~71^2~2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eae0185a9677d3ff0c1781ee196f2ef42deb0ea1;p=pandora-kernel.git Merge branch 'spear/clock' into next/clock Viresh Kumar writes: This is rebased over a (merge of Mike's/clk-next & SPEAr's DT) + Russell's patch: CLKDEV: provide helpers for common clock framework rebased over them. * spear/clock: SPEAr: Switch to common clock framework SPEAr: Call clk_prepare() before calling clk_enable SPEAr: clk: Add General Purpose Timer Synthesizer clock SPEAr: clk: Add Fractional Synthesizer clock SPEAr: clk: Add Auxiliary Synthesizer clock SPEAr: clk: Add VCO-PLL Synthesizer clock Conflicts: drivers/clk/Makefile [Arnd: rebased again without the spear/dt branch] Signed-off-by: Arnd Bergmann --- eae0185a9677d3ff0c1781ee196f2ef42deb0ea1 Reading git-diff-tree failed