From: Steven Rostedt (Red Hat) <rostedt@goodmis.org>
Date: Wed, 9 Jul 2014 15:02:34 +0000 (-0400)
Subject: Merge branch 'trace/ftrace/urgent' into trace/ftrace/core
X-Git-Tag: omap-for-v3.17/fixes-against-rc2~186^2~36
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca65ef1ab6b498b77985b9a3f5ab12c09bbf764e;p=pandora-kernel.git

Merge branch 'trace/ftrace/urgent' into trace/ftrace/core

Needed 099ed151675c "tracing: Remove ftrace_stop/start() from
 reading the trace file" for the removal of ftrace_start/stop().
---

ca65ef1ab6b498b77985b9a3f5ab12c09bbf764e
Reading git-diff-tree failed