]> git.ipfire.org Git - people/ms/linux.git/commitdiff
projects / people / ms / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b2e09f6 fb24da8)
Merge branch 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Jun 2014 03:03:47 +0000 (20:03 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Jun 2014 03:03:47 +0000 (20:03 -0700)
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

1  2 
arch/x86/kernel/apic/io_apic.c patch | diff1 | diff2 | blob | history
arch/x86/kernel/irq.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/kernel/apic/io_apic.c
Simple merge
diff --cc arch/x86/kernel/irq.c
Simple merge
Michael's Linux tree.