Conflicts:
	tools/perf/builtin-record.c

Merge reason: add the live tracing feature, resolve conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>