diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 14:08:10 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 14:08:10 +0100 |
| commit | 08cab72f91c8b28ffabfd143119bccdd4a115ad7 (patch) | |
| tree | ccd5583971caecd82bf2d1e62691bf6e0362d650 /arch/arm/mach-s3c2410/nor-simtec.c | |
| parent | 86c1e5a74af11e4817ffa6d7748d9ac1353b5b53 (diff) | |
| parent | f37a53cc5d8a8fb199e41386d125d8c2ed9e54ef (diff) | |
| download | blackbird-obmc-linux-08cab72f91c8b28ffabfd143119bccdd4a115ad7.tar.gz blackbird-obmc-linux-08cab72f91c8b28ffabfd143119bccdd4a115ad7.zip | |
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
Diffstat (limited to 'arch/arm/mach-s3c2410/nor-simtec.c')
0 files changed, 0 insertions, 0 deletions
