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

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



Resolve an MSR enumeration conflict.

Conflicts:
	arch/x86/include/asm/msr-index.h

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 25e56847 f454b18e
Show 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