tree adaf2c45384c306bc43c0d8272c9062f88dcf669
parent 9579f10dfdd91d5a1bc77a588b630bc945d9fb95
parent 5fa10196bdb5f190f595ebd048490ee52dddea0f
author Linus Torvalds <torvalds@linux-foundation.org> 1394242716 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1394242716 -0800

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

Pull x86 fixes from Peter Anvin:
 "A small collection of minor fixes.  The FPU stuff is still pending, I
  fear.  I haven't heard anything from Suresh so I suspect I'm going to
  have to dig into the init specifics myself and fix up the patchset"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Ignore NMIs that come in during early boot
  x86, trace: Further robustify CR2 handling vs tracing
  x86, trace: Fix CR2 corruption when tracing page faults
  x86/efi: Quirk out SGI UV