]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitf2b4918b38cd87d2769beeb3c5614f7bd723a65f
tree074543e1c6a303e3119e9493ad33213fdd5f0a92
parent29b2fa4af337ee4879412b56c9b46d5d45293e7b
parent36cd717329f17544ef9e35a688b9431ecadaf509
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