Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Jan 2014 20:08:51 +0000 (12:08 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 20 Jan 2014 20:08:51 +0000 (12:08 -0800)
commit8bd6964cbd177de731b4b3ff624ef7fb6eaca15c
tree00c1d97b86ac0d22efd2a9218577f9348ff3379f
parent2bb2c5e235e8459de5761f89bc2bcb2efd2b6b45
parentf3d815cb854b2f6262ade56a4d91a1ed3f1e50c4
Merge branch 'x86-mm-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 mm changes from Ingo Molnar:
 "A cleanup, a fix and ASLR support for hugetlb mappings"

* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm/numa: Fix 32-bit kernel NUMA boot
  x86/mm: Implement ASLR for hugetlb mappings
  x86/mm: Unify pte_to_pgoff() and pgoff_to_pte() helpers