From: Olof Johansson <olof@lixom.net>
Date: Sun, 28 Apr 2013 22:06:56 +0000 (-0700)
Subject: Merge branch 'gic/cleanup' into next/soc
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~68^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0d20b69d3fa74a21ec363989612bddd58b930b8;p=pandora-kernel.git

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
---

e0d20b69d3fa74a21ec363989612bddd58b930b8
Reading git-diff-tree failed