android_kernel_motorola_sm6225/drivers/clk
Arnd Bergmann 93c6d8927f Merge branch 'clk/mxs' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/clock
Shawn Guo <shawn.guo@linaro.org> writes:

  mxs common clk porting for v3.5.  It depends on the following two branches.

  [1] git://git.linaro.org/people/mturquette/linux.git clk-next
  [2] http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git clkdev

  As the mxs device tree conversion will constantly touch clock files,
  to save the conflicts, the updated mxs/dt branch coming later will
  based on this pull-request.

* 'clk/mxs' of git://git.linaro.org/people/shawnguo/linux-2.6:
  ARM: mxs: remove now unused timer_clk argument from mxs_timer_init
  ARM: mxs: remove old clock support
  ARM: mxs: switch to common clk framework
  ARM: mxs: change the lookup name for fec phy clock
  ARM: mxs: request clock for timer
  clk: mxs: add clock support for imx28
  clk: mxs: add clock support for imx23
  clk: mxs: add mxs specific clocks

Includes an update to Linux 3.4-rc6

Conflicts:
	drivers/clk/Makefile

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-05-11 17:15:31 +02:00
..
mxs ARM: mxs: remove now unused timer_clk argument from mxs_timer_init 2012-05-09 00:02:43 +08:00
clk-divider.c clk: Use a separate struct for holding init data. 2012-05-01 18:13:20 -07:00
clk-fixed-factor.c clk: add a fixed factor clock 2012-05-08 14:13:25 -07:00
clk-fixed-rate.c clk: Use a separate struct for holding init data. 2012-05-01 18:13:20 -07:00
clk-gate.c clk: Use a separate struct for holding init data. 2012-05-01 18:13:20 -07:00
clk-mux.c clk: mux: assign init data 2012-05-08 14:13:07 -07:00
clk.c clk: remove COMMON_CLK_DISABLE_UNUSED 2012-05-08 14:12:42 -07:00
clkdev.c CLKDEV: provide helpers for common clock framework 2012-05-02 09:30:32 +01:00
Kconfig clk: remove COMMON_CLK_DISABLE_UNUSED 2012-05-08 14:12:42 -07:00
Makefile Merge branch 'clk/mxs' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/clock 2012-05-11 17:15:31 +02:00