tree 43b7cdc527446229570152a65664eb06fa75ea1c
parent 971eae7c99212dd67b425a603f1fe3b763359907
parent 896dc5064083063981954f142e43548765199792
author Linus Torvalds <torvalds@linux-foundation.org> 1396292288 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1396292288 -0700

Merge branch 'x86-acpi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 acpi numa fix from Ingo Molnar:
 "A single NUMA CPU hotplug fix"

* 'x86-acpi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, acpi: Fix bug in associating hot-added CPUs with corresponding NUMA node