| commit | 16097439703bcd38e9fe5608c12add6dacb825ea | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Fri Mar 06 11:39:18 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Fri Mar 06 11:39:18 2009 +0100 |
| tree | 9f6572fefdeb3e7c61f701ed9a86979d5525ccd8 | |
| parent | 40ada30f9621fbd831ac2437b9a2a399aad34b00 [diff] | |
| parent | 0012693ad4f636c720fed3802027f9427962f540 [diff] |
Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing/core