diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-12 07:40:08 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-12 07:40:08 +0100 |
commit | f3134de60624829a57741c1f3796847d4de165f6 (patch) | |
tree | 7e05f048d7a6ac115b4e4acc4db0296d84d1e7d5 /kernel/trace | |
parent | e726f5f91effd8944c76475a2688093a03ba0d10 (diff) | |
parent | 361b73d5c34f59c3fd107bb9dbe7a1fbff2c2517 (diff) |
Merge branches 'tracing/function-graph-tracer' and 'tracing/ring-buffer' into tracing/core
Diffstat (limited to 'kernel/trace')
0 files changed, 0 insertions, 0 deletions