Ingo Molnar 737f24bda7 Merge branch 'perf/urgent' into perf/core
Conflicts:
	tools/perf/builtin-record.c
	tools/perf/builtin-top.c
	tools/perf/perf.h
	tools/perf/util/top.h

Merge reason: resolve these cherry-picking conflicts.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2012-03-05 09:20:08 +01:00
..
2011-07-25 20:57:14 -07:00
2011-03-29 14:48:19 +02:00
2011-03-31 11:26:23 -03:00
2011-03-29 14:48:19 +02:00