Merge branch 'for-3.6/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren...
authorArnd Bergmann <[email protected]>
Fri, 6 Jul 2012 20:13:07 +0000 (22:13 +0200)
committerArnd Bergmann <[email protected]>
Fri, 6 Jul 2012 20:13:07 +0000 (22:13 +0200)
From Stephen Warren <[email protected]>:

* '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 <[email protected]>

Trivial merge