Ingo Molnar bb3c3e8071 Merge commit 'v2.6.32-rc5' into perf/probes ...

Conflicts:
	kernel/trace/trace_event_profile.c

Merge reason: update to -rc5 and resolve conflict.

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

2009-10-17 09:58:25 +02:00

..

events

Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

2009-10-04 12:39:14 -07: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 commit 'linus/master' into tracing/kprobes

2009-09-23 23:08:43 +02:00

power.h

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

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

syscall.h

tracing: Ftrace dynamic ftrace_event_call support

2009-08-27 00:46:40 +02:00