Merge branch 'gic' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux...

* 'gic' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
  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
  + Linux 3.9-rc3

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-s3c24xx/irq.c
Simple merge

diff --cc drivers/irqchip/irq-gic.c
index 80a4f7a,add1fd8..47aea33
--- 1/drivers/irqchip/irq-gic.c
--- 2/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@@ -799,15 -820,8 +820,8 @@@ void __init gic_init_bases(unsigned in
        gic_pm_init(gic);
  }
  
- void __cpuinit gic_secondary_init(unsigned int gic_nr)
- {
-       BUG_ON(gic_nr >= MAX_GIC_NR);
- 
-       gic_cpu_init(&gic_data[gic_nr]);
- }
- 
  #ifdef CONFIG_OF
 -static int gic_cnt __initdata = 0;
 +static int gic_cnt __initdata;
  
  int __init gic_of_init(struct device_node *node, struct device_node *parent)
  {