Skip to content
Commit 06e09002 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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



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

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 3aba0b40 1a1d569a
Expand all 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