From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 27 Dec 2011 22:19:50 +0000 (+0000)
Subject: Merge branch 'tegra/cleanup' into next/cleanup
X-Git-Tag: v3.3-rc1~144^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70d84a6431d732cbc4e68e72b6890cdd3865d43d;p=pandora-kernel.git

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
---

70d84a6431d732cbc4e68e72b6890cdd3865d43d
Reading git-diff-tree failed