Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 May 2010 16:17:50 +0000 (09:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 18 May 2010 16:17:50 +0000 (09:17 -0700)
commit1f8caa986a5f4de2e40f3defe66a07b4c5a019c2
tree3bd71405d98a9a0851c8b60c589a14d58743b8a0
parentd6f3875252bb703a9a3de0b92f7ae154f12c986c
parent2e61878698781d6a9a8bfbaa4ea9c5ddb5a178c3
Merge branch 'x86-mm-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86-64: Combine SRAT regions when possible
arch/x86/mm/srat_64.c