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

Merge branch 'x86/cpu' into x86/platform, to avoid conflict 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents db06d759 ce53da02
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment