diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-19 10:20:17 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-19 10:20:17 +0100 |
| commit | 40999096e8b9872199bf56ecd0c4d98397ccaf2f (patch) | |
| tree | a1019965100c10cae52014c447bfb4d1381ebec9 /kernel/trace/trace_selftest.c | |
| parent | Merge branch 'linus' into tracing/blktrace (diff) | |
| parent | tracing/core: remove unused parameter in tracing_fill_pipe_page() (diff) | |
| parent | Merge branch 'tip/tracing/urgent' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| download | linux-40999096e8b9872199bf56ecd0c4d98397ccaf2f.tar.xz linux-40999096e8b9872199bf56ecd0c4d98397ccaf2f.zip | |
Merge branches 'tracing/blktrace', 'tracing/ftrace' and 'tracing/urgent' into tracing/core