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
2013-04-14 20:49:28 -07:00
2013-02-08 10:17:22 +00:00
2013-04-09 17:04:36 +02:00
2013-04-28 15:06:56 -07:00
2013-04-03 16:45:51 +01:00
2013-03-22 17:10:35 +00:00
2013-04-03 16:45:50 +01:00
2013-04-28 15:06:56 -07:00
2013-01-24 17:57:20 +09:00
2013-02-21 15:27:22 -08:00
2013-02-05 10:26:20 -08:00
2013-03-30 12:05:26 -07:00
2013-04-17 23:53:20 -07:00
2013-02-28 20:09:24 -08:00
2013-02-05 10:26:20 -08:00
2013-03-18 09:40:38 +11:00
2013-04-28 15:06:56 -07:00
2013-03-18 13:49:57 +00:00
2013-02-05 10:26:20 -08:00
2013-02-05 10:26:20 -08:00
2013-03-26 16:12:02 +00:00
2013-04-28 15:06:56 -07:00
2013-02-28 18:54:15 +01:00
2013-02-28 18:54:15 +01:00
2013-02-05 10:26:20 -08:00
2013-02-05 10:26:20 -08:00
2013-03-12 16:20:45 -07:00
2013-03-28 16:56:31 +00:00
2013-02-28 18:54:15 +01:00
2013-02-05 10:26:20 -08:00
2013-03-15 16:27:53 +08:00
2013-04-28 15:06:56 -07:00
2013-02-28 18:54:15 +01:00
2013-03-28 16:45:42 +00:00
2013-04-01 16:31:03 +08:00
2013-03-03 22:54:11 +00:00
2013-02-28 18:54:15 +01:00
2013-03-19 11:20:16 -07:00
2013-04-28 15:06:56 -07:00
2013-02-28 18:54:15 +01:00
2013-01-24 17:57:20 +09:00
2013-04-28 15:06:56 -07:00
2013-03-12 16:20:45 -07:00
2013-02-21 14:58:40 -08:00
2013-02-05 10:26:20 -08:00
2013-03-26 16:11:43 +00:00
2013-04-04 15:17:14 +09:00
2013-02-21 14:58:40 -08:00
2013-01-24 17:57:20 +09:00
2013-03-14 23:57:57 +01:00
2013-02-28 18:54:15 +01:00
2013-02-05 10:26:20 -08:00
2013-04-28 15:06:56 -07:00
2013-04-28 15:06:56 -07:00
2013-03-12 10:56:32 +01:00
2013-02-26 09:24:48 -08:00
2013-03-26 16:12:02 +00:00
2013-02-28 18:54:15 +01:00
2013-04-28 15:06:56 -07:00
2013-02-28 18:54:15 +01:00
2013-04-28 15:06:56 -07:00
2013-02-28 18:54:15 +01:00
2013-02-28 18:54:15 +01:00
2013-03-26 16:12:02 +00:00
2013-02-21 15:27:22 -08:00
2013-02-21 14:58:40 -08:00
2013-01-29 10:55:28 -08:00
2013-04-03 16:45:49 +01:00
2013-03-12 11:33:05 -04:00
2013-02-28 20:00:40 -08:00
2013-03-08 22:07:19 +00:00
2013-04-28 15:06:56 -07:00
2013-03-05 23:30:24 +01:00
2013-03-26 16:12:02 +00:00
2013-03-01 21:09:59 +00:00
2013-02-19 22:01:55 -05:00
2013-04-09 16:40:45 +02:00
2013-03-19 13:56:05 +08:00
2013-02-21 15:40:16 -08:00
e0d20b69d3