From: Steven Rostedt (Red Hat) Date: Wed, 9 Jul 2014 15:02:34 +0000 (-0400) Subject: Merge branch 'trace/ftrace/urgent' into trace/ftrace/core X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ca65ef1ab6b498b77985b9a3f5ab12c09bbf764e;p=linux-beck.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