From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 3 Jan 2012 20:36:08 +0000 (+0000)
Subject: Merge branch 'imx/clk' into next/clk
X-Git-Tag: upstream/snapshot3+hdmi~8403^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8c3b2296f1aa13d7504d2c09bc819cef3759562a;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'imx/clk' into next/clk

* imx/clk:
  ARM: mxs: select HAVE_CLK_PREPARE for clock
  clk: add config option HAVE_CLK_PREPARE into Kconfig
  ASoC: mxs-saif: convert to clk_prepare/clk_unprepare
  video: mxsfb: convert to clk_prepare/clk_unprepare
  serial: mxs-auart: convert to clk_prepare/clk_unprepare
  net: flexcan: convert to clk_prepare/clk_unprepare
  mtd: gpmi-lib: convert to clk_prepare/clk_unprepare
  mmc: mxs-mmc: convert to clk_prepare/clk_unprepare
  dma: mxs-dma: convert to clk_prepare/clk_unprepare
  net: fec: add clk_prepare/clk_unprepare
  ARM: mxs: convert platform code to clk_prepare/clk_unprepare
  clk: add helper functions clk_prepare_enable and clk_disable_unprepare
---

8c3b2296f1aa13d7504d2c09bc819cef3759562a