| commit | f0461d0146ee30927bc7efa2ae24ea8c6693b725 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Wed Dec 03 08:49:21 2008 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Wed Dec 03 08:49:21 2008 +0100 |
| tree | 6a6b416c76c0e1a569af5531454fb45fe06e07ba | |
| parent | 66eafebc1086014709dc38f52ddcb3d67d9b346c [diff] | |
| parent | 48d68b20d00865035b8b65e69af343d0f53fac9d [diff] |
Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing/core