From: Steven Rostedt <srostedt@redhat.com>
Date: Mon, 16 Aug 2010 15:17:30 +0000 (-0400)
Subject: Merge branch 'tip/perf/urgent-3' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.36-rc2~40^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d244b6bd41e09ecbb09c738cc2c108be227398c8;p=pandora-kernel.git

Merge branch 'tip/perf/urgent-3' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into trace/tip/perf/urgent-4

Conflicts:
	kernel/trace/trace_events.c

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

d244b6bd41e09ecbb09c738cc2c108be227398c8
Reading git-diff-tree failed