]> git.karo-electronics.de Git - mv-sheeva.git/commit
projects / mv-sheeva.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dc43d9f 1e01979)
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)
commit9e39264ed4f687251632c0a6f4a70c2e51719662
tree27651ca028328ac5e7b5a030312ad113b6cb8b2btree | snapshot
parentdc43d9fa73d82083656fb9c02f4823bcdcfb9f91commit | diff
parent1e01979c8f502ac13e3cdece4f38712c5944e6e8commit | 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/
Linux for Marvell Sheeva based platforms