Merge tag 'tegra-for-3.15-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra...
authorOlof Johansson <olof@lixom.net>
Thu, 20 Mar 2014 21:38:53 +0000 (14:38 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 20 Mar 2014 21:38:53 +0000 (14:38 -0700)
commiteccceebd7e7985c2371bf6624e6e174abbf37dce
tree162d1ac3a0181fbdc766dac616985275b92e0c88
parent5d4089a4ad06980c67c8e5a2527f73e085d02423
parent357281ed092ac5713137fa42b447cdd68a4aa56e
Merge tag 'tegra-for-3.15-soc' of git://git./linux/kernel/git/tegra/linux into next/soc

Merge "ARM: tegra: core SoC changes for 3.15" from Stephen Warren:

A couple of minor fixes, plus the removal of the EMC scaling driver,
which hasn't been active since we converted clocks to device tree.

* tag 'tegra-for-3.15-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Export I/O rail functions
  ARM: tegra: remove tegra EMC scaling driver
  ARM: tegra: don't timeout if CPU is powergated

Signed-off-by: Olof Johansson <olof@lixom.net>