summaryrefslogtreecommitdiff
path: root/drivers/scsi
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-12-27 22:19:50 +0000
committerArnd Bergmann <arnd@arndb.de>2011-12-27 22:19:50 +0000
commit70d84a6431d732cbc4e68e72b6890cdd3865d43d (patch)
tree074543e1c6a303e3119e9493ad33213fdd5f0a92 /drivers/scsi
parent0363e3dae1001179c9d26a44391bb8557dc2f240 (diff)
parentf5ce5e7e9cc3f69c3e6a0a4599262f740aff92c0 (diff)
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
Diffstat (limited to 'drivers/scsi')
0 files changed, 0 insertions, 0 deletions