]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'x86-numa-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Jul 2011 00:04:18 +0000 (17:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Jul 2011 00:04:18 +0000 (17:04 -0700)
commit515efd25a46deb7c7700a315676b46915f4a37c2
tree27651ca028328ac5e7b5a030312ad113b6cb8b2b
parentce4c06365bbaed42b835632c050fba67cd34de9c
parent72b18f7124979e48ddc1bf6c79c92879a8cf1ae7
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/