diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2015-04-11 00:58:19 +0200 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2015-04-11 00:58:19 +0200 |
| commit | a01e7b3258bea93fbf1f028fab1c739d80c61823 (patch) | |
| tree | f78d0d13faa406524a58d9ce64756ffdabb64400 /arch/arm/boot/dts/omap5.dtsi | |
| parent | Merge branch 'irqchip/stacked-exynos' into irqchip/core (diff) | |
| parent | ARM: zynq: switch from gic_arch_extn to gic_set_irqchip_flags (diff) | |
| download | linux-a01e7b3258bea93fbf1f028fab1c739d80c61823.tar.xz linux-a01e7b3258bea93fbf1f028fab1c739d80c61823.zip | |
Merge branch 'irqchip/stacked-irq_set_wake' into irqchip/core
Conflicts:
drivers/irqchip/irq-gic.c
Diffstat (limited to 'arch/arm/boot/dts/omap5.dtsi')
0 files changed, 0 insertions, 0 deletions