diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-08 18:59:19 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-08 18:59:19 +0200 |
| commit | 797b3a9ee790e8de2a34d427de96a1bb560fe0db (patch) | |
| tree | dcc58ac1a966294b010521def7296d428f858583 /drivers/pinctrl/pinctrl-u300.c | |
| parent | Merge branch 'zynq/core-smp' of git://git.xilinx.com/linux-xlnx into next/soc2 (diff) | |
| parent | irqchip: vic: add include of linux/irq.h (diff) | |
| download | linux-797b3a9ee790e8de2a34d427de96a1bb560fe0db.tar.xz linux-797b3a9ee790e8de2a34d427de96a1bb560fe0db.zip | |
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>
Diffstat (limited to 'drivers/pinctrl/pinctrl-u300.c')
0 files changed, 0 insertions, 0 deletions