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

Merge branch 'x86/cpu' into perf/core, to resolve conflict 



Conflicts:
	arch/x86/events/intel/uncore.c

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 3442a9ec d9782807
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