Merge branch 'perf/urgent' into perf/core, to resolve a conflict
Conflicts:
tools/perf/ui/browsers/hists.c
Signed-off-by:
Ingo Molnar <mingo@kernel.org>
Showing
Please register or sign in to comment
Conflicts:
tools/perf/ui/browsers/hists.c
Signed-off-by:
Ingo Molnar <mingo@kernel.org>