From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 27 Sep 2015 10:51:42 +0000 (-0400)
Subject: Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: microblaze-4.7-rc1~1326
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=162e6df47c4f80c87cb617ec473eca015df454ca;p=linux-2.6-microblaze.git

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

Pull x86 fixes from Thomas Gleixner:
 "Two bugfixes from Andy addressing at least some of the subtle NMI
  related wreckage which has been reported by Sasha Levin"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/nmi/64: Fix a paravirt stack-clobbering bug in the NMI code
  x86/paravirt: Replace the paravirt nop with a bona fide empty function
---

162e6df47c4f80c87cb617ec473eca015df454ca