]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'for-3.5/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren...
authorOlof Johansson <olof@lixom.net>
Thu, 10 May 2012 06:26:01 +0000 (23:26 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 10 May 2012 06:26:15 +0000 (23:26 -0700)
By Stephen Warren
via Stephen Warren
* 'for-3.5/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
  ARM: disable SUSPEND/ARCH_SUSPEND_POSSIBLE for ARCH_TEGRA
  ARM: tegra: add pll_x freq table entry for 750MHz

Signed-off-by: Olof Johansson <olof@lixom.net>
1  2 
arch/arm/Kconfig

Simple merge