]> Pileus Git - ~andy/linux/commit
Merge branch 'for-3.6/common-clk' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Fri, 6 Jul 2012 20:21:23 +0000 (22:21 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 6 Jul 2012 20:21:23 +0000 (22:21 +0200)
commit524cd267e54a5314aa83f058bc7991b21a1cfad5
tree0e8fd3f21a6cad040134248fff2a0a2b9095198e
parentebaaa25de8376292b2dfc8252f5213e3a28bac70
parent094479915618c526a1409dd6704bcb4ff2c5c1c2
Merge branch 'for-3.6/common-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/clk

From Stephen Warren <swarren@wwwdotorg.org>:

This branch contains numerous changes required as a baseline in order to
convert Tegra to the common clock framework. The intention was to also
include patches to actually convert Tegra to the common clock framework.
However, those patches appeared late in the kernel cycle and currently
cause regressions on some boards, so were dropped for now.

* 'for-3.6/common-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
  ARM: tegra: Provide clock for only one PWM controller
  ARM: tegra: Fix PWM clock programming
  ARM: tegra: dma: rename driver name for clock to "tegra-apbdma"
  ARM: tegra: Remove second instance of uart clk
  crypto: add clk_prepare/clk_unprepare
  ASoC: tegra: add clk_prepare/clk_unprepare
  staging: nvec: add clk_prepare/clk_unprepare
  spi/tegra: add clk_prepare/clk_unprepare
  Input: tegra-kbc - add clk_prepare/clk_unprepare
  USB: ehci-tegra: add clk_prepare/clk_unprepare
  mmc: tegra: add clk_prepare/clk_unprepare
  i2c: tegra: Add clk_prepare/clk_unprepare
  ARM: tegra: add clk_prepare/clk_unprepare

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
drivers/mmc/host/sdhci-tegra.c
sound/soc/tegra/tegra30_ahub.c