diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-04 17:16:51 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-04 17:16:51 +1000 |
| commit | 52851256cec4106a487b16b830f4d5bf98262344 (patch) | |
| tree | b9b48fa5da4ae9e433f86246ace09d38184c7a4e /sound | |
| parent | 9d504e3e3c1d96bb4c8aa4ac510bd55f43b72bd1 (diff) | |
| parent | c115d15552c011fdf3caf15792ce0c62e8837470 (diff) | |
Merge remote-tracking branch 'irqchip/irqchip/for-next'
Conflicts:
Documentation/devicetree/bindings/arm/gic.txt
arch/arm64/Kconfig
drivers/irqchip/irq-gic.c
Diffstat (limited to 'sound')
0 files changed, 0 insertions, 0 deletions