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

Merge branch 'perf/live' into perf/core



Conflicts:
	tools/perf/builtin-record.c

Merge reason: add the live tracing feature, resolve conflict.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents f9212819 a0cccc2e
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