maxmustermann/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
linux/arch/arm/mach-ux500
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: cleanups 2013-02-21 14:58:40 -08:00
board-mop500-audio.c ARM: arm-soc: multiplatform conversion patches 2012-12-13 10:57:16 -08:00
board-mop500-pins.c ARM: arm-soc: driver specific changes 2012-12-13 10:59:11 -08:00
board-mop500-regulators.c ARM: ux500: Provide SMSC911x fixed-regulator when not booting DT 2012-09-04 10:14:31 +02:00
board-mop500-regulators.h ARM: ux500: Provide SMSC911x fixed-regulator when not booting DT 2012-09-04 10:14:31 +02:00
board-mop500-sdi.c ARM: ux500: Stop passing ios_handler() as an MMCI power controlling call-back 2013-03-27 20:20:00 +01:00
board-mop500-stuib.c Input: bu21013_ts - move GPIO init and exit functions into the driver 2012-11-27 23:05:11 -08:00
board-mop500-u8500uib.c ARM: ux500: included linux/gpio.h twice 2012-02-29 16:32:38 +01:00
board-mop500-uib.c ARM: ux500: de-globalize <mach/id.h> 2013-01-29 18:47:37 +01:00
board-mop500.c ARM: ux500: Enable the clock controlling Ethernet on Snowball 2013-03-27 20:20:40 +01:00
board-mop500.h ARM: ux500: Enable the clock controlling Ethernet on Snowball 2013-03-27 20:20:40 +01:00
cache-l2x0.c ARM: mach-ux500: enable 128KB way L2 cache on DB8540 2013-03-18 13:49:58 +01:00
cpu-db8500.c ARM: ux500: Enable the clock controlling Ethernet on Snowball 2013-03-27 20:20:40 +01:00
cpu.c arm-soc: cleanups 2013-02-21 14:58:40 -08:00
cpuidle.c ARM: ux500: add spin_unlock(&master_lock). 2013-01-23 12:51:09 +01:00
devices-common.c ARM: plat-nomadik: convert platforms to SPARSE_IRQ 2012-11-05 09:55:34 +01:00
devices-common.h ARM: ux500: add PRCM register base for pinctrl 2012-11-08 13:44:41 +01:00
devices-db8500.c mfd: db8500-prcmu: update resource passing 2013-02-12 12:44:27 +01:00
devices-db8500.h mfd: db8500-prcmu: update resource passing 2013-02-12 12:44:27 +01:00
devices.c
headsmp.S
hotplug.c ARM: consolidate pen_release instead of having per platform definitions 2012-09-14 11:15:01 +02:00
id.c ARM: ux500: de-globalize <mach/id.h> 2013-01-29 18:47:37 +01:00
id.h ARM: ux500: de-globalize <mach/id.h> 2013-01-29 18:47:37 +01:00
Kconfig pinctrl/abx500: add AB8540 sub-driver 2013-02-05 13:54:21 +01:00
Makefile Merge branch 'for-arm-soc-next' of git://git.linaro.org/people/ljones/linux-3.0-ux500 into next/dt 2012-09-22 22:20:37 -07:00
Makefile.boot ARM: move all dtb targets out of Makefile.boot 2012-09-14 09:22:04 -05:00
pins-db8500.h ARM: ux500: remove a bunch of internal pull-ups 2012-04-24 09:36:05 +02:00
platsmp.c irqchip: gic: Perform the gic_secondary_init() call via CPU notifier 2013-03-26 16:12:02 +00:00
ste-dma40-db8500.h
timer.c Removal of the <mach/id.h> include from ux500 2013-01-29 16:06:03 -08:00
usb.c ARM: plat-nomadik: move DMA40 header to <linux/platform_data> 2012-11-05 09:55:32 +01:00