Skip to content
Commit 9cea0d46 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/cpu' into x86/core, to resolve conflicts 



Conflicts:
	arch/x86/include/asm/cpufeatures.h

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 8c490b42 08f253ec
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment