Steven Rostedt f0218b3e99 Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/core-6 ... Conflicts: include/trace/ftrace.h kernel/trace/trace_kprobe.c Acked-by: Masami Hiramatsu <mhiramat@redhat.com> Acked-by: Frederic Weisbecker <fweisbec@gmail.com> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>		2010-05-18 00:35:23 -04:00
..
events	Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/core-6	2010-05-18 00:35:23 -04:00
boot.h
define_trace.h	tracing: Fix tracepoint.h DECLARE_TRACE() to allow more than one header	2010-05-05 11:46:17 -04:00
ftrace.h	Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/core-6	2010-05-18 00:35:23 -04:00
syscall.h	tracing: Allow events to share their print functions	2010-05-14 14:20:32 -04:00