diff options
author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-07-09 11:02:34 -0400 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2014-07-09 11:02:34 -0400 |
commit | ca65ef1ab6b498b77985b9a3f5ab12c09bbf764e (patch) | |
tree | bf51ef31302b8efeca7699347fbddd32cf34fbf4 /include/linux/ftrace.h | |
parent | d048a8c7b509f35dd351e1415fe49fa99e4cb7ef (diff) | |
parent | 099ed151675cd1d2dbeae1dac697975f6a68716d (diff) | |
download | op-kernel-dev-ca65ef1ab6b498b77985b9a3f5ab12c09bbf764e.zip op-kernel-dev-ca65ef1ab6b498b77985b9a3f5ab12c09bbf764e.tar.gz |
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().
Diffstat (limited to 'include/linux/ftrace.h')
0 files changed, 0 insertions, 0 deletions