]> www.infradead.org Git - linux.git/commitdiff
projects / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d048a8c 099ed15)
Merge branch 'trace/ftrace/urgent' into trace/ftrace/core
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>
Wed, 9 Jul 2014 15:02:34 +0000 (11:02 -0400)
committerSteven Rostedt <rostedt@goodmis.org>
Wed, 9 Jul 2014 15:02:34 +0000 (11:02 -0400)
Needed 099ed151675c "tracing: Remove ftrace_stop/start() from
 reading the trace file" for the removal of ftrace_start/stop().

1  2 
kernel/trace/trace.c patch | diff1 | diff2 | blob | history

diff --cc kernel/trace/trace.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.