git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c985d7e bc895b5)
Merge branch 'gic/cleanup' into next/soc2
authorArnd Bergmann <arnd@arndb.de>
Mon, 8 Apr 2013 16:59:19 +0000 (18:59 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 8 Apr 2013 16:59:19 +0000 (18:59 +0200)
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>

Trivial merge
Pandora Kernel Repository