From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 8 Apr 2013 16:59:19 +0000 (+0200)
Subject: Merge branch 'gic/cleanup' into next/soc2
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~9^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=797b3a9ee790e8de2a34d427de96a1bb560fe0db;p=pandora-kernel.git

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>
---

797b3a9ee790e8de2a34d427de96a1bb560fe0db
Reading git-diff-tree failed