linux/include/trace
Frederic Weisbecker d7a4b414ee Merge commit 'linus/master' into tracing/kprobes
Conflicts:
	kernel/trace/Makefile
	kernel/trace/trace.h
	kernel/trace/trace_event_types.h
	kernel/trace/trace_export.c

Merge reason:
	Sync with latest significant tracing core changes.
2009-09-23 23:08:43 +02:00
..
events Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2009-09-23 09:46:15 -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