Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
authorIngo Molnar <mingo@elte.hu>
Wed, 26 Aug 2009 06:29:02 +0000 (08:29 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 26 Aug 2009 06:29:02 +0000 (08:29 +0200)
commit35dce1a99d010f3d738af4ce1b9b77302fdfe69c
treee34a37de965a79a2ae301de4d0557f500111dde6
parent7cb2e3ee2aeec5b83ecadba929a2dc575dd4008f
parent1c569f0264ea629c10bbab471dd0626ce4d3f19f
Merge branch 'tracing/core' of git://git./linux/kernel/git/frederic/random-tracing into tracing/core

Conflicts:
include/linux/tracepoint.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>
include/linux/tracepoint.h
include/trace/define_trace.h
include/trace/ftrace.h
kernel/trace/trace_syscalls.c