diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-18 08:52:13 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-18 08:52:13 +0100 |
| commit | 5a209c2d58e70f9bc415b9cdf0e3b9aaefb70371 (patch) | |
| tree | 02e63e90cc26792eaea21dced12bd7c10f996d30 /kernel | |
| parent | Merge branches 'tracing/branch-tracer', 'tracing/ftrace', 'tracing/function-r... (diff) | |
| parent | tracing: branch tracer, fix writing to trace/trace_options (diff) | |
| parent | kernel/profile.c: fix section mismatch warning (diff) | |
| download | linux-5a209c2d58e70f9bc415b9cdf0e3b9aaefb70371.tar.gz linux-5a209c2d58e70f9bc415b9cdf0e3b9aaefb70371.zip | |
Merge branches 'tracing/branch-tracer' and 'tracing/urgent' into tracing/core