diff options
| author | Olof Johansson <olof@lixom.net> | 2013-04-28 22:06:56 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-04-28 22:06:56 (GMT) |
| commit | e0d20b69d3fa74a21ec363989612bddd58b930b8 (patch) | |
| tree | 8ed7c390f99c4d40f59f5dc49e39b077fbb9947f /arch/arm/mach-tegra/pm.c | |
| parent | 128673b3646beba4f5a41f50a7a21c3c2f3455ca (diff) | |
| parent | bc895b5987dd5fad89c0e9693b38104679b647c4 (diff) | |
| download | linux-e0d20b69d3fa74a21ec363989612bddd58b930b8.tar.xz | |
Merge branch 'gic/cleanup' into next/soc
Merge in the gic cleanup since it has a handful of annoying internal conflicts
with soc development branches. All of them are delete/delete conflicts.
* gic/cleanup:
irqchip: vic: add include of linux/irq.h
irqchip: gic: Perform the gic_secondary_init() call via CPU notifier
irqchip: gic: Call handle_bad_irq() directly
arm: Move chained_irq_(enter|exit) to a generic file
arm: Move the set_handle_irq and handle_arch_irq declarations to asm/irq.h
Signed-off-by: Olof Johansson <olof@lixom.net>
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-socfpga/platsmp.c
Diffstat (limited to 'arch/arm/mach-tegra/pm.c')
0 files changed, 0 insertions, 0 deletions