diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-19 09:00:35 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-19 09:00:35 +0100 |
| commit | 72c26c9a26ea7f2f3d14f162c2ebb07805f724ea (patch) | |
| tree | bf1b4bc0b69f96c79474f9edb9cf0e811c95f2dc /kernel/trace/trace_functions_graph.c | |
| parent | Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff) | |
| download | linux-72c26c9a26ea7f2f3d14f162c2ebb07805f724ea.tar.gz linux-72c26c9a26ea7f2f3d14f162c2ebb07805f724ea.zip | |
Merge branch 'linus' into tracing/blktrace
Conflicts:
block/blktrace.c
Semantic merge:
kernel/trace/blktrace.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/trace/trace_functions_graph.c')
0 files changed, 0 insertions, 0 deletions