tree ab97efb5785f77ed83292c97ba9e5909cfee8fba
parent 5f0a6e2d503896062f641639dacfe5055c2f593b
parent e1482a1708e48add8d2f4ecc949885e0e552d9e8
author Arnd Bergmann <arnd@arndb.de> 1325622968 +0000
committer Arnd Bergmann <arnd@arndb.de> 1325622968 +0000

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