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)
commit797b3a9ee790e8de2a34d427de96a1bb560fe0db
treedcc58ac1a966294b010521def7296d428f858583
parentc985d7e325fd5c2bf78de2f705f6001bce143a26
parentbc895b5987dd5fad89c0e9693b38104679b647c4
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>
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
drivers/pinctrl/pinctrl-at91.c
drivers/pinctrl/pinctrl-nomadik.c
drivers/pinctrl/pinctrl-sirf.c