tree 6a41361e1de2a6693ccae96b99307e79a467236f
parent 34273f41d57ee8d854dcd2a1d754cbb546cb548f
parent 7ed6fb9b5a5510e4ef78ab27419184741169978a
author H. Peter Anvin <hpa@linux.intel.com> 1400710999 -0700
committer H. Peter Anvin <hpa@linux.intel.com> 1400710999 -0700

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>