087494997ea1c8a2faf39af38c5
author Steven Rostedt <srostedt@redhat.com> 1274149613 -0400
committer Steven Rostedt <rostedt@goodmis.org> 1274157323 -0400

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>
UEÈû’lx