diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 17:04:18 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 17:04:18 -0700 |
commit | 9e39264ed4f687251632c0a6f4a70c2e51719662 (patch) | |
tree | 27651ca028328ac5e7b5a030312ad113b6cb8b2b /arch/x86/include/asm/apb_timer.h | |
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/
Diffstat (limited to 'arch/x86/include/asm/apb_timer.h')
0 files changed, 0 insertions, 0 deletions