Ingo Molnar 4331595650 Merge branch 'perf/core' into perf/probes ...

Conflicts:
	tools/perf/Makefile

Merge reason:

 - fix the conflict
 - pick up the pr_*() infrastructure to queue up dependent patch

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2009-10-23 08:23:20 +02:00

..

events

events: Harmonize event field names and print output names

2009-10-15 12:42:03 +02:00

boot.h

tracing/fastboot: include missing headers

2008-12-12 09:26:13 +01:00

define_trace.h

tracing: Undef TRACE_EVENT_FN between trace events headers inclusion

2009-08-27 18:32:54 +02:00

ftrace.h

Merge branch 'perf/core' into perf/probes

2009-10-23 08:23:20 +02:00

power.h

tracing: replace TP<var> with TP_<var>

2009-03-10 00:35:04 -04:00

syscall.h

Merge branch 'perf/core' into perf/probes

2009-10-23 08:23:20 +02:00