summaryrefslogtreecommitdiff
path: root/arch/arm/mach-at91/irq.c
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-04-28 15:06:56 -0700
committerOlof Johansson <olof@lixom.net>2013-04-28 15:06:56 -0700
commite0d20b69d3fa74a21ec363989612bddd58b930b8 (patch)
tree8ed7c390f99c4d40f59f5dc49e39b077fbb9947f /arch/arm/mach-at91/irq.c
parent128673b3646beba4f5a41f50a7a21c3c2f3455ca (diff)
parentbc895b5987dd5fad89c0e9693b38104679b647c4 (diff)
Merge branch 'gic/cleanup' into next/soc
Merge in the gic cleanup since it has a handful of annoying internal conflicts with soc development branches. All of them are delete/delete conflicts. * gic/cleanup: irqchip: vic: add include of linux/irq.h irqchip: gic: Perform the gic_secondary_init() call via CPU notifier irqchip: gic: Call handle_bad_irq() directly arm: Move chained_irq_(enter|exit) to a generic file arm: Move the set_handle_irq and handle_arch_irq declarations to asm/irq.h Signed-off-by: Olof Johansson <olof@lixom.net> Conflicts: arch/arm/mach-shmobile/smp-emev2.c arch/arm/mach-shmobile/smp-r8a7779.c arch/arm/mach-shmobile/smp-sh73a0.c arch/arm/mach-socfpga/platsmp.c
Diffstat (limited to 'arch/arm/mach-at91/irq.c')
0 files changed, 0 insertions, 0 deletions