diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-04 09:07:44 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-04 09:07:44 +0100 |
commit | b29144c317fb748dae6d72c0f88eda9d43165b8d (patch) | |
tree | 6752c13edb19fb4d992d0202b0c2276d6734b373 /block | |
parent | Merge commit 'v2.6.28-rc7' into tracing/core (diff) | |
parent | ftrace: fix race in function graph during fork (diff) | |
parent | tracing/function-graph-tracer: enabled by default (diff) | |
download | linux-b29144c317fb748dae6d72c0f88eda9d43165b8d.tar.xz linux-b29144c317fb748dae6d72c0f88eda9d43165b8d.zip |
Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing/core