diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2009-03-13 04:33:17 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 04:33:17 +0100 |
| commit | 4c6ed8f496fe89ff81b3d6e617a531bedfb613e4 (patch) | |
| tree | b93b6c8c71c5f2e716dd05b126e01ef4e20ff0af /kernel/trace/trace_output.c | |
| parent | Merge branch 'core/locking' into tracing/ftrace (diff) | |
| download | linux-dev-4c6ed8f496fe89ff81b3d6e617a531bedfb613e4.tar.xz linux-dev-4c6ed8f496fe89ff81b3d6e617a531bedfb613e4.zip | |
Merge branches 'tracing/ftrace' and 'linus' into tracing/core
Diffstat (limited to 'kernel/trace/trace_output.c')
0 files changed, 0 insertions, 0 deletions