leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
e0d20b69d3
linux/arch/arm/mach-prima2
History
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
..
include/mach arm-soc: soc-specific updates 2013-02-21 15:27:22 -08:00
common.c arm: prima2: add new SiRFatlas6 machine in common board 2013-03-18 17:15:26 +01:00
common.h ARM: PRIMA2: add new SiRFmarco SMP SoC infrastructures 2013-01-22 19:53:27 +08:00
headsmp.S ARM: prima2: remove duplicate v7_invalidate_l1 2013-02-20 18:21:58 +01:00
hotplug.c ARM: prima2: fix __init section for cpu hotplug 2013-02-14 14:36:35 +01:00
irq.c ARM: PRIMA2: irq: make prima2 irq can work even we enable GIC for Marco 2013-01-22 19:39:14 +08:00
Kconfig arm: prima2: add new SiRFatlas6 machine in common board 2013-03-18 17:15:26 +01:00
l2x0.c ARM: PRIMA2: initialize l2x0 according to mach from DT 2013-01-22 19:37:15 +08:00
lluart.c ARM: CSR: mapping early DEBUG_LL uart 2011-07-09 07:20:51 +08:00
Makefile ARM: PRIMA2: add new SiRFmarco SMP SoC infrastructures 2013-01-22 19:53:27 +08:00
Makefile.boot ARM: dtb: move all dtb targets to common Makefile 2012-09-20 22:58:17 -07:00
platsmp.c irqchip: gic: Perform the gic_secondary_init() call via CPU notifier 2013-03-26 16:12:02 +00:00
pm.c ARM: drivers: remove __dev* attributes. 2013-01-03 15:57:04 -08:00
pm.h ARM: CSR: PM: add sleep entry for SiRFprimaII 2011-09-21 23:25:59 +08:00
rstc.c ARM: PRIMA2: rstc: enable the support for Marco 2013-01-22 19:38:48 +08:00
rtciobrg.c Merge branch 'marco-timer-cleanup-rebase' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel into next/soc 2013-01-27 23:03:42 -08:00
sleep.S ARM: CSR: PM: add sleep entry for SiRFprimaII 2011-09-21 23:25:59 +08:00
timer-marco.c ARM: PRIMA2: add new SiRFmarco SMP SoC infrastructures 2013-01-22 19:53:27 +08:00
timer-prima2.c Merge branch 'marco-timer-cleanup-rebase' of git://gitorious.org/sirfprima2-kernel/sirfprima2-kernel into next/soc 2013-01-27 23:03:42 -08:00