tree df966071c6721c30cb60fb94a8cfbbbea40827e9
parent 24e55910e4801d772f95becde20b526b8b10388d
parent a8aed3e0752b4beb2e37cbed6df69faae88268da
author Linus Torvalds <torvalds@linux-foundation.org> 1361936729 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1361936729 -0800

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Ingo Molnar.

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm/pageattr: Prevent PSE and GLOABL leftovers to confuse pmd/pte_present and pmd_huge
  Revert "x86, mm: Make spurious_fault check explicitly check explicitly check the PRESENT bit"
  x86/mm/numa: Don't check if node is NUMA_NO_NODE
  x86, efi: Make "noefi" really disable EFI runtime serivces
  x86/apic: Fix parsing of the 'lapic' cmdline option