Olof Johansson e0d20b69d3 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		2013-04-28 15:06:56 -07:00
..
core.h	ARM: socfpga: Enable soft reset	2013-04-14 20:17:33 -07:00
headsmp.S	arm: socfpga: Add SMP support for actual socfpga harware	2013-02-11 19:37:26 -08:00
Kconfig	ARM: socfpga: Enable SMP for socfpga	2012-10-26 14:59:39 +02:00
Makefile	ARM: socfpga: Enable SMP for socfpga	2012-10-26 14:59:39 +02:00
platsmp.c	Merge branch 'gic/cleanup' into next/soc	2013-04-28 15:06:56 -07:00
socfpga.c	ARM: socfpga: Upgrade clk driver for socfpga to make use of dts clock entries	2013-04-14 20:18:13 -07:00