From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 21 Apr 2011 17:01:03 +0000 (-0700)
Subject: Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~7613^2~1569
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d20dc4d5231592b25a0d77c45ebb7c05204dfb3a;p=firefly-linux-kernel-4.4.55.git

Merge branch 'x86-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, numa: Fix cpu nodemasks for NUMA emulation and CONFIG_DEBUG_PER_CPU_MAPS
  Revert "x86, NUMA: Fix fakenuma boot failure"
---

d20dc4d5231592b25a0d77c45ebb7c05204dfb3a