linux/tools
Ingo Molnar 84b13fd596 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: Ingo Molnar <mingo@elte.hu>
2010-04-15 09:13:26 +02:00
..
perf Merge branch 'perf/live' into perf/core 2010-04-15 09:13:26 +02:00