| commit | ca65ef1ab6b498b77985b9a3f5ab12c09bbf764e | [log] [tgz] |
|---|---|---|
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | Wed Jul 09 11:02:34 2014 -0400 |
| committer | Steven Rostedt <rostedt@goodmis.org> | Wed Jul 09 11:02:34 2014 -0400 |
| tree | bf51ef31302b8efeca7699347fbddd32cf34fbf4 | |
| parent | d048a8c7b509f35dd351e1415fe49fa99e4cb7ef [diff] | |
| parent | 099ed151675cd1d2dbeae1dac697975f6a68716d [diff] |
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().