]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2582c0d fe137e0)
Merge commit 'fe137e09e1ac27dc3e225f3e91c4e456073e965c' 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)
commitf3e76ce22ba13928394467ed4e5c7230e8d969ca
tree6a41361e1de2a6693ccae96b99307e79a467236ftree | snapshot
parent2582c0d90457507cb946e994be5d10e3902f8610commit | diff
parentfe137e09e1ac27dc3e225f3e91c4e456073e965ccommit | diff
Merge commit 'fe137e09e1ac27dc3e225f3e91c4e456073e965c' into x86/espfix

Merge in Linus' tree with:

06ba6fe7c251 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>
init/main.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.