From: Steven Rostedt <srostedt@redhat.com>
Date: Fri, 21 May 2010 15:49:57 +0000 (-0400)
Subject: Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux... 
X-Git-Tag: v2.6.35-rc1~30^2~6^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff5f149b6aec8edbfa3698721667acd043009a33;p=pandora-kernel.git

Merge branch 'perf/core' of git://git./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>
---

ff5f149b6aec8edbfa3698721667acd043009a33
Reading git-diff-tree failed