diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-12-20 16:40:51 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-12-20 16:40:51 +0100 |
| commit | 8bcee1832d23869c2cdb6886ae5210b0143256f0 (patch) | |
| tree | 9fac190248ed9ed10fe4e6f7b1b4cda8eaef7ddd /arch/ia64 | |
| parent | ARM: mach-shmobile: Bump up NR_IRQS to 1024 (diff) | |
| parent | ARM: mach-shmobile: INTC interrupt priority level demux fix (diff) | |
| download | linux-8bcee1832d23869c2cdb6886ae5210b0143256f0.tar.xz linux-8bcee1832d23869c2cdb6886ae5210b0143256f0.zip | |
Merge branch 'rmobile/urgent' into rmobile-latest
Conflicts:
arch/arm/mach-shmobile/include/mach/entry-macro.S
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/ia64')
0 files changed, 0 insertions, 0 deletions