tree 35dbb478d247a43c2827b634316cc65fa3cbfa4b
parent ecb679fc2c5e737c1f2e3578646f1d6edf7ce3e2
parent 7209a75d2009dbf7745e2fd354abf25c3deb3ca3
author Linus Torvalds <torvalds@linux-foundation.org> 1406939821 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1406939821 -0700

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

Pull x86 fix from Peter Anvin:
 "A single fix to not invoke the espfix code on Xen PV, as it turns out
  to oops the guest when invoked after all.  This patch leaves some
  amount of dead code, in particular unnecessary initialization of the
  espfix stacks when they won't be used, but in the interest of keeping
  the patch minimal that cleanup can wait for the next cycle"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86_64/entry/xen: Do not invoke espfix64 on Xen