From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 2 May 2013 21:43:58 +0000 (-0700)
Subject: Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~3680^2~597
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a8bdf745126593308927dfa264d3d2158338a148;p=firefly-linux-kernel-4.4.55.git

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

Pull x86 fixes from Peter Anvin:
 "Two regression fixes:

  1. On 64 bits, we would set NX on non-NX-capable hardware (very rare
     in 64-bit land, but a nonzero subset.)

  2. Fix suspend/resume across kernel versions"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86-64, init: Do not set NX bits on non-NX capable hardware
  x86, gdt, hibernate: Store/load GDT for hibernate path.
---

a8bdf745126593308927dfa264d3d2158338a148