tree 15ed6ba564cd04b4ac7235f85ea7489d4eeaaa9b
parent 93c6d8927fa692faef3d7d945bd4fe84b0185ad4
parent 5df33a62c4a028d6fc7f2dcc159827d09b7334b8
author Arnd Bergmann <arnd@arndb.de> 1336860666 +0200
committer Arnd Bergmann <arnd@arndb.de> 1336860666 +0200

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>