Merge branch 'for-3.6/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren...
authorArnd Bergmann <arnd@arndb.de>
Fri, 6 Jul 2012 20:13:07 +0000 (22:13 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 6 Jul 2012 20:13:07 +0000 (22:13 +0200)
commit5914f1a5bea192e57cd104635c69c19703f0a426
treecd76b3836598058e7004bcfe27f29cf8930de58f
parent8e31cbc66b4c92fd1b70cbacc4917df322345f42
parent95ef9958849381931a79ecec53e677e52c406c5a
Merge branch 'for-3.6/fixes' of git://git./linux/kernel/git/swarren/linux-tegra into next/cleanup

From Stephen Warren <swarren@wwwdotorg.org>:

* 'for-3.6/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
  ARM: tegra: build powergate unconditionally
  ARM: tegra: Fix dts files w/ status property: "disable" -> "disabled"

Signed-off-by: Arnd Bergmann <arnd@arndb.de>