diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-12 20:03:47 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-12 20:03:47 -0700 |
commit | 71998d1be4ae70e7d320cdd21595c1a02a29c61e (patch) | |
tree | ae386748d50db8b116d0eeaee2106f0f5f9b1c07 /arch/blackfin/include/asm/dma.h | |
parent | b2e09f633a3994ee97fa6bc734b533d9c8e6ea0f (diff) | |
parent | fb24da805729ee4a83efa34015948f7d64da4b28 (diff) | |
download | linux-71998d1be4ae70e7d320cdd21595c1a02a29c61e.tar.gz linux-71998d1be4ae70e7d320cdd21595c1a02a29c61e.tar.bz2 linux-71998d1be4ae70e7d320cdd21595c1a02a29c61e.zip |
Merge branch 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 irq fixes from Ingo Molnar:
"Two changes: a cpu-hotplug/irq race fix, plus a HyperV related fix"
* 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/irq: Fix fixup_irqs() error handling
x86, irq, pic: Probe for legacy PIC and set legacy_pic appropriately
Diffstat (limited to 'arch/blackfin/include/asm/dma.h')
0 files changed, 0 insertions, 0 deletions