diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-02 18:20:34 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-02 18:20:34 +0200 |
commit | 907977b2a22c5d1f465fbe9657d0003f057f9b1e (patch) | |
tree | eb17cdc63201d0778906fed0e22d8794ab97f7bd /drivers/memstick/host/jmb38x_ms.c | |
parent | Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
parent | Merge tag 'irq-fixes-4.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
download | linux-907977b2a22c5d1f465fbe9657d0003f057f9b1e.tar.xz linux-907977b2a22c5d1f465fbe9657d0003f057f9b1e.zip |
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Thomas Gleixner:
"Two small fixlets:
- select a required Kconfig to make the MVEBU driver compile
- add the missing MIPS local GIC interrupts which prevent drivers to
probe successfully"
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
irqchip/mips-gic: Fix Local compare interrupt
irqchip/mvebu-odmi: Select GENERIC_MSI_IRQ_DOMAIN
Diffstat (limited to 'drivers/memstick/host/jmb38x_ms.c')
0 files changed, 0 insertions, 0 deletions