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

Merge branch 'perf/urgent' into perf/core, to resolve conflicts 



Conflicts:
	tools/perf/builtin-kmem.c

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 32b0ed3a 44b11fee
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