OSDN Git Service

(root) / uclinux-h8 / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commitca65ef1ab6b498b77985b9a3f5ab12c09bbf764e
treebf51ef31302b8efeca7699347fbddd32cf34fbf4tree | snapshot
parentd048a8c7b509f35dd351e1415fe49fa99e4cb7efcommit | diff
parent099ed151675cd1d2dbeae1dac697975f6a68716dcommit | 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().
kernel/trace/trace.c diff1 | diff2 | blob | history
About OSDN
Find Software
Develop Software
Help