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

..

events

Merge branch 'perf/urgent' into perf/core

2012-03-05 09:20:08 +01:00

define_trace.h

Revert "tracing: Include module.h in define_trace.h"

2011-10-31 19:32:35 -04:00

ftrace.h

perf: Fix counter of ftrace events

2011-10-04 11:07:54 +02:00

syscall.h

tracing: Use a global field list for all syscall exit events

2010-06-28 17:12:44 -04:00