linux/arch/arm/mach-zynq
Arnd Bergmann 797b3a9ee7 Merge branch 'gic/cleanup' into next/soc2
Both zynq and shmobile have conflicts against the gic cleanup
series, resolved here.

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-zynq/platsmp.c
	drivers/gpio/gpio-pl061.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2013-04-08 18:59:19 +02:00
..
common.c arm: zynq: Add smp support 2013-04-04 09:24:00 +02:00
common.h arm: zynq: Add hotplug support 2013-04-04 09:24:00 +02:00
headsmp.S arm: zynq: Add smp support 2013-04-04 09:24:00 +02:00
hotplug.c arm: zynq: Add hotplug support 2013-04-04 09:24:00 +02:00
Kconfig arm: zynq: Add smp support 2013-04-04 09:24:00 +02:00
Makefile arm: zynq: Add hotplug support 2013-04-04 09:24:00 +02:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
platsmp.c Merge branch 'gic/cleanup' into next/soc2 2013-04-08 18:59:19 +02:00
slcr.c arm: zynq: Add smp support 2013-04-04 09:24:00 +02:00