| commit | e6ab9a20e73e790d47e6aa231fcf66f27b6ce3d4 | [log] [tgz] |
|---|---|---|
| author | H. Peter Anvin <hpa@linux.intel.com> | Wed May 21 15:23:19 2014 -0700 |
| committer | H. Peter Anvin <hpa@linux.intel.com> | Wed May 21 15:23:19 2014 -0700 |
| tree | 6a41361e1de2a6693ccae96b99307e79a467236f | |
| parent | 34273f41d57ee8d854dcd2a1d754cbb546cb548f [diff] | |
| parent | 7ed6fb9b5a5510e4ef78ab27419184741169978a [diff] |
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>