Steven Rostedt ff5f149b6a Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into trace/tip/tracing/core-7 ...

Conflicts:
	include/linux/ftrace_event.h
	include/trace/ftrace.h
	kernel/trace/trace_event_perf.c
	kernel/trace/trace_kprobe.c
	kernel/trace/trace_syscalls.c

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

2010-05-21 11:49:57 -04:00

..

events

Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

2010-05-18 08:35:04 -07:00

boot.h

tracing/fastboot: include missing headers

2008-12-12 09:26:13 +01:00

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-7

2010-05-21 11:49:57 -04:00

syscall.h

tracing: Allow events to share their print functions

2010-05-14 14:20:32 -04:00