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
..
2012-03-27 16:41:24 -07:00
2012-03-23 16:58:40 -07:00
2012-03-27 16:47:35 -07:00
2012-03-23 16:58:39 -07:00
2012-03-23 16:58:40 -07:00
2011-06-01 19:29:39 -07:00
2012-03-23 16:58:39 -07:00
2012-03-23 16:58:39 -07:00
2011-08-26 17:26:35 -07:00
2012-03-23 16:58:39 -07:00
2012-03-28 12:34:33 -07:00
2012-03-23 16:58:39 -07:00
2012-03-23 16:58:39 -07:00
2012-03-23 16:58:39 -07:00
2012-03-29 18:02:10 -07:00
2012-03-23 16:58:39 -07:00
2012-03-23 16:58:39 -07:00
2012-03-23 16:58:39 -07:00