diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-25 06:50:07 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-25 06:50:07 -0500 |
| commit | 2b1b858f690d6369a59ad241335eeedec6eb0c8c (patch) | |
| tree | 91838f66d8ef6bb42fe66849c5cbd05650d272a3 /kernel/trace/trace.c | |
| parent | 886b5b73d71e4027d7dc6c14f5f7ab102201ea6b (diff) | |
| parent | 1473e4417c79f12d91ef91a469699bfa911f510f (diff) | |
Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/ftrace
Diffstat (limited to 'kernel/trace/trace.c')
0 files changed, 0 insertions, 0 deletions