From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 20 Jan 2014 20:08:51 +0000 (-0800)
Subject: Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.14-rc1~160
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8bd6964cbd177de731b4b3ff624ef7fb6eaca15c;p=kernel%2Fkernel-generic.git

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
---

8bd6964cbd177de731b4b3ff624ef7fb6eaca15c