Merge branch 'gic/cleanup' into next/soc
authorOlof Johansson <olof@lixom.net>
Sun, 28 Apr 2013 22:06:56 +0000 (15:06 -0700)
committerOlof Johansson <olof@lixom.net>
Sun, 28 Apr 2013 22:06:56 +0000 (15:06 -0700)
commite0d20b69d3fa74a21ec363989612bddd58b930b8
tree8ed7c390f99c4d40f59f5dc49e39b077fbb9947f
parent128673b3646beba4f5a41f50a7a21c3c2f3455ca
parentbc895b5987dd5fad89c0e9693b38104679b647c4
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
arch/arm/mach-exynos/common.c
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
arch/arm/mach-tegra/platsmp.c
drivers/gpio/gpio-tegra.c
drivers/pinctrl/pinctrl-at91.c