From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 23 Jul 2011 00:04:18 +0000 (-0700)
Subject: Merge branch 'x86-numa-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.1-rc1~286
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=9e39264ed4f687251632c0a6f4a70c2e51719662;p=sfrench%2Fcifs-2.6.git

Merge branch 'x86-numa-for-linus' of git://git./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: Implement pfn -> nid mapping granularity check
  x86, mm: s/PAGES_PER_ELEMENT/PAGES_PER_SECTION/
---

9e39264ed4f687251632c0a6f4a70c2e51719662