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

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



Conflicts:
	tools/power/x86/turbostat/turbostat.c

Recent turbostat changes conflicted with a pending rename of x86 model names in tip:x86/cpu,
sort it out.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents a3d8c0d1 9f159ae0
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment