diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-20 05:15:13 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-20 05:15:13 -0400 |
| commit | 44fc6ee92356aa3be31798ced220ab5abd898781 (patch) | |
| tree | 45acaa8fe5e620cbf734bdbeb5d48121daa65d0e /kernel/trace/trace_events.c | |
| parent | 22de89b371a18086162eacd9f8c960299334ab01 (diff) | |
| parent | 5087f8d2a2f2daff5a913d72d8ea3ad601948e10 (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_events.c')
0 files changed, 0 insertions, 0 deletions