summaryrefslogtreecommitdiffstats
path: root/arch/x86/pci
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-12-10 22:40:11 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-10 22:40:11 +0100
commit773fed910d41e443e495a6bfa9ab1c2b7b13e012 (patch)
tree40ce690d2a870ed378e2e5860a21c7a3fd4ee62e /arch/x86/pci
parentMerge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... (diff)
parentx86: numachip: APIC driver cleanups (diff)
parentx86: UV BAU: Increase maximum CPUs per socket/hub (diff)
downloadlinux-773fed910d41e443e495a6bfa9ab1c2b7b13e012.tar.xz
linux-773fed910d41e443e495a6bfa9ab1c2b7b13e012.zip
Merge branches 'x86-platform-for-linus' and 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 platform changes from Ingo Molnar: "A handful of numachip APIC driver updates/fixes, and two small SGI/UV fixes" * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86: numachip: APIC driver cleanups x86: numachip: Elide self-IPI ICR polling x86: numachip: Fix 16-bit APIC ID truncation * 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86: UV BAU: Increase maximum CPUs per socket/hub x86: UV BAU: Avoid NULL pointer reference in ptc_seq_show