Merge branch 'tegra/cleanup' into next/cleanup
authorArnd Bergmann <arnd@arndb.de>
Tue, 27 Dec 2011 22:19:50 +0000 (22:19 +0000)
committerArnd Bergmann <arnd@arndb.de>
Tue, 27 Dec 2011 22:19:50 +0000 (22:19 +0000)
* tegra/cleanup:
  arm/tegra: Remove code that's ifndef CONFIG_ARM_GIC
  arm/tegra: remove unused defines
  arm/tegra: fix variable formatting in makefile

Conflicts:
arch/arm/mach-tegra/include/mach/entry-macro.S


Trivial merge