]> 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)
commit5c07228674847da3a89faca5ee642afc54e35861
tree074543e1c6a303e3119e9493ad33213fdd5f0a92
parent0e10feac1ac8a5c1525d7fc5bc55a8c5d7edc504
parent2839d665ba68df5ad178f42e993a98178ce5b56a
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