tree 81522f679ccdf38067e03102d2b64e44fc777204
parent ba1a96fc7ddcaf0c8d4a6752f6a70f080bc307ac
parent 4ea48a01bb1a99f4185b77cd90cf962730336cc4
author Linus Torvalds <torvalds@linux-foundation.org> 1413246496 +0200
committer Linus Torvalds <torvalds@linux-foundation.org> 1413246496 +0200

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

Pull x86 fixes from Ingo Molnar:
 "Misc smaller fixes that missed the v3.17 cycle"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/build: Add arch/x86/purgatory/ make generated files to gitignore
  x86: Fix section conflict for numachip
  x86: Reject x32 executables if x32 ABI not supported
  x86_64, entry: Filter RFLAGS.NT on entry from userspace
  x86, boot, kaslr: Fix nuisance warning on 32-bit builds