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)
commit70d84a6431d732cbc4e68e72b6890cdd3865d43d
tree074543e1c6a303e3119e9493ad33213fdd5f0a92
parent0363e3dae1001179c9d26a44391bb8557dc2f240
parentf5ce5e7e9cc3f69c3e6a0a4599262f740aff92c0
Merge branch 'tegra/cleanup' into next/cleanup

* 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
arch/arm/mach-tegra/include/mach/entry-macro.S