From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 10 Dec 2014 21:40:11 +0000 (-0800)
Subject: Merge branches 'x86-platform-for-linus' and 'x86-uv-for-linus' of git://git.kernel... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=773fed910d41e443e495a6bfa9ab1c2b7b13e012;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branches 'x86-platform-for-linus' and 'x86-uv-for-linus' of git://git./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
---

773fed910d41e443e495a6bfa9ab1c2b7b13e012