| commit | 9e39264ed4f687251632c0a6f4a70c2e51719662 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 22 17:04:18 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 22 17:04:18 2011 -0700 |
| tree | 27651ca028328ac5e7b5a030312ad113b6cb8b2b | |
| parent | dc43d9fa73d82083656fb9c02f4823bcdcfb9f91 [diff] | |
| parent | 1e01979c8f502ac13e3cdece4f38712c5944e6e8 [diff] |
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: Implement pfn -> nid mapping granularity check x86, mm: s/PAGES_PER_ELEMENT/PAGES_PER_SECTION/