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

3.5 KiB

Raw Blame History

View Raw