mirror of
https://github.com/torvalds/linux.git
synced 2024-12-09 12:41:33 +00:00
e0d20b69d3
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 |
||
---|---|---|
.. | ||
include/mach | ||
common.c | ||
common.h | ||
headsmp.S | ||
hotplug.c | ||
irq.c | ||
Kconfig | ||
l2x0.c | ||
lluart.c | ||
Makefile | ||
Makefile.boot | ||
platsmp.c | ||
pm.c | ||
pm.h | ||
rstc.c | ||
rtciobrg.c | ||
sleep.S | ||
timer-marco.c | ||
timer-prima2.c |