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
..
asm	Merge branch 'gic/cleanup' into next/soc2	2013-04-08 18:59:19 +02:00
debug	arm-soc: soc-specific updates	2013-02-21 15:27:22 -08:00
uapi/asm	ARM: 7665/1: Wire up kcmp syscall	2013-03-03 22:54:18 +00:00