Skip to content
Commit b29144c3 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing/core

parents b8307db2 e8e1abe9 764f3b95
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment