| commit | 8bd6964cbd177de731b4b3ff624ef7fb6eaca15c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 20 12:08:51 2014 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 20 12:08:51 2014 -0800 |
| tree | 00c1d97b86ac0d22efd2a9218577f9348ff3379f | |
| parent | 2bb2c5e235e8459de5761f89bc2bcb2efd2b6b45 [diff] | |
| parent | f3d815cb854b2f6262ade56a4d91a1ed3f1e50c4 [diff] |
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/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