From: H. Peter Anvin <hpa@linux.intel.com>
Date: Wed, 21 May 2014 22:23:19 +0000 (-0700)
Subject: Merge commit '7ed6fb9b5a5510e4ef78ab27419184741169978a' into x86/espfix
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e6ab9a20e73e790d47e6aa231fcf66f27b6ce3d4;p=linux.git

Merge commit '7ed6fb9b5a5510e4ef78ab27419184741169978a' into x86/espfix

Merge in Linus' tree with:

fa81511bb0bb x86-64, modify_ldt: Make support for 16-bit segments a runtime option

... reverted, to avoid a conflict.  This commit is no longer necessary
with the proper fix in place.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---

e6ab9a20e73e790d47e6aa231fcf66f27b6ce3d4