linux/arch/x86/include/uapi
H. Peter Anvin 03c1b4e8e5 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>
2014-05-21 17:36:33 -07:00
..
asm Merge remote-tracking branch 'origin/x86/espfix' into x86/vdso 2014-05-21 17:36:33 -07:00