]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Feb 2013 03:45:29 +0000 (19:45 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Feb 2013 03:45:29 +0000 (19:45 -0800)
commit2003cd90c473f66d34114bc61c49e7d74d370894
treedf966071c6721c30cb60fb94a8cfbbbea40827e9
parent24e55910e4801d772f95becde20b526b8b10388d
parenta8aed3e0752b4beb2e37cbed6df69faae88268da
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
arch/x86/mm/numa.c
arch/x86/mm/pageattr.c
arch/x86/platform/efi/efi.c