projects / firefly-linux-kernel-4.4.55.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 34273f4 7ed6fb9)
Merge commit '7ed6fb9b5a5510e4ef78ab27419184741169978a' into x86/espfix
authorH. Peter Anvin <hpa@linux.intel.com>
Wed, 21 May 2014 22:23:19 +0000 (15:23 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Wed, 21 May 2014 22:23:19 +0000 (15:23 -0700)
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>
1  2 
init/main.c patch | diff1 | diff2 | blob | history

diff --cc init/main.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.