Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit fe47784b authored by H. Peter Anvin's avatar H. Peter Anvin
Browse files

Merge branch 'x86/cpu' into x86/xsave 

Conflicts:

	arch/x86/kernel/cpu/feature_names.c
	include/asm-x86/cpufeature.h
parents 83b8e28b af2e1f27
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment