From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 28 Feb 2010 18:39:36 +0000 (-0800)
Subject: Merge branch 'x86-numa-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.34-rc1~253
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=1eca9acbf9cda6437db7de1097c7a18014b1289d;p=~emulex%2Finfiniband.git

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

* 'x86-numa-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, numa: Remove configurable node size support for numa emulation
  x86, numa: Add fixed node size option for numa emulation
  x86, numa: Fix numa emulation calculation of big nodes
  x86, acpi: Map hotadded cpu to correct node.
---

1eca9acbf9cda6437db7de1097c7a18014b1289d