summaryrefslogtreecommitdiffstats
path: root/arch/x86/platform
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-12-10 13:40:11 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-10 13:40:11 -0800
commit773fed910d41e443e495a6bfa9ab1c2b7b13e012 (patch)
tree40ce690d2a870ed378e2e5860a21c7a3fd4ee62e /arch/x86/platform
parent8139548136d966863751a6e5ce8a19d08c4f374a (diff)
parentb980dcf25d0ee1f0f8c7b6afc0e715a2f5da5ec4 (diff)
parent3ab0c49fd6b1e80438d0a649584d292880112262 (diff)
downloadop-kernel-dev-773fed910d41e443e495a6bfa9ab1c2b7b13e012.zip
op-kernel-dev-773fed910d41e443e495a6bfa9ab1c2b7b13e012.tar.gz
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
OpenPOWER on IntegriCloud