Skip to content
Commit 7ce7f35b authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'x86/cpufeature' into x86/cache 



Resolve the cpu/scattered conflict.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parents f4107702 47bdf337
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