| commit | 08cab72f91c8b28ffabfd143119bccdd4a115ad7 | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Mon Oct 31 14:08:10 2011 +0100 |
| committer | Arnd Bergmann <arnd@arndb.de> | Mon Oct 31 14:08:10 2011 +0100 |
| tree | ccd5583971caecd82bf2d1e62691bf6e0362d650 | |
| parent | 86c1e5a74af11e4817ffa6d7748d9ac1353b5b53 [diff] | |
| parent | f37a53cc5d8a8fb199e41386d125d8c2ed9e54ef [diff] |
Merge branch 'dt/gic' into next/dt Conflicts: arch/arm/include/asm/localtimer.h arch/arm/mach-msm/board-msm8x60.c arch/arm/mach-omap2/board-generic.c