diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-04 03:07:44 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-04 03:07:44 -0500 |
| commit | b29144c317fb748dae6d72c0f88eda9d43165b8d (patch) | |
| tree | 6752c13edb19fb4d992d0202b0c2276d6734b373 /kernel/trace | |
| parent | b8307db2477f9c551e54e0c7b643ea349a3349cd (diff) | |
| parent | e8e1abe92fd7ea9d823a3aaf81d10e2cba593b6b (diff) | |
| parent | 764f3b95131a7ce5c992e3d00caf590fcada2f7b (diff) | |
Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing/core