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

Resolved merge conflict in tools/perf/Makefile

Merge reason: we want to queue up a dependent patch.

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

2009-11-17 10:17:47 +01:00

..

events

tracing: Rename 'lockdep' event subsystem into 'lock'

2009-11-13 10:48:27 +01: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

tracing, perf_events: Protect the buffer from recursion in perf

2009-11-08 10:31:42 +01: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