From: Steven Rostedt <srostedt@redhat.com>
Date: Tue, 18 May 2010 02:26:53 +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~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f0218b3e9974f06014b61be8987159f4a20e011e;p=pandora-kernel.git

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

f0218b3e9974f06014b61be8987159f4a20e011e
Reading git-diff-tree failed