summaryrefslogtreecommitdiffstats
path: root/arch/arm/lib
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-05-13 00:11:06 +0200
committerArnd Bergmann <arnd@arndb.de>2012-05-13 00:11:06 +0200
commiteae0185a9677d3ff0c1781ee196f2ef42deb0ea1 (patch)
tree15ed6ba564cd04b4ac7235f85ea7489d4eeaaa9b /arch/arm/lib
parentMerge branch 'clk/mxs' of git://git.linaro.org/people/shawnguo/linux-2.6 into... (diff)
parentSPEAr: Switch to common clock framework (diff)
downloadlinux-eae0185a9677d3ff0c1781ee196f2ef42deb0ea1.tar.xz
linux-eae0185a9677d3ff0c1781ee196f2ef42deb0ea1.zip
Merge branch 'spear/clock' into next/clock
Viresh Kumar <viresh.kumar@st.com> 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 <arnd@arndb.de>
Diffstat (limited to 'arch/arm/lib')
0 files changed, 0 insertions, 0 deletions