Merge branch 'for-3.6/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/cleanup

Browse source

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>

...

This commit is contained in:

Arnd Bergmann 2012-07-06 22:13:07 +02:00

parent 8e31cbc66b 95ef995884

commit 5914f1a5be

3 changed files with 38 additions and 38 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

36

arch/arm/boot/dts/tegra20.dtsi

View file

38

arch/arm/boot/dts/tegra30.dtsi

View file

2

arch/arm/mach-tegra/Makefile

View file