Frederic Weisbecker 8f8ffe2485 Merge commit 'tracing/core' into tracing/kprobes ... Conflicts: kernel/trace/trace_export.c kernel/trace/trace_kprobe.c Merge reason: This topic branch lacks an important build fix in tracing/core: 0dd7b74787eaf7858c6c573353a83c3e2766e674: tracing: Fix double CPP substitution in TRACE_EVENT_FN that prevents from multiple tracepoint headers inclusion crashes. Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>		2009-09-11 01:09:23 +02:00
..
events	Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into tracing/core	2009-08-26 08:29:02 +02:00
boot.h
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 'tracing/core' into tracing/kprobes	2009-09-11 01:09:23 +02:00
power.h
syscall.h	tracing: Ftrace dynamic ftrace_event_call support	2009-08-27 00:46:40 +02:00