tree 30ca1237d094d66df1dc1533f7bf39b3877b5932
parent ac49b9a9f26b6c42585f87857722085ef4b19c13
parent e6ab9a20e73e790d47e6aa231fcf66f27b6ce3d4
author H. Peter Anvin <hpa@linux.intel.com> 1400718993 -0700
committer H. Peter Anvin <hpa@linux.intel.com> 1400718993 -0700

Merge remote-tracking branch 'origin/x86/espfix' into x86/vdso

Merge x86/espfix into x86/vdso, due to changes in the vdso setup code
that otherwise cause conflicts.

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