diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-28 02:19:50 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-28 02:19:50 +0400 |
| commit | 70d84a6431d732cbc4e68e72b6890cdd3865d43d (patch) | |
| tree | 074543e1c6a303e3119e9493ad33213fdd5f0a92 /include/linux/tipc.h | |
| parent | 0363e3dae1001179c9d26a44391bb8557dc2f240 (diff) | |
| parent | f5ce5e7e9cc3f69c3e6a0a4599262f740aff92c0 (diff) | |
| download | linux-70d84a6431d732cbc4e68e72b6890cdd3865d43d.tar.xz | |
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 'include/linux/tipc.h')
0 files changed, 0 insertions, 0 deletions