diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-05 08:45:22 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-05 08:45:22 -0500 |
| commit | 970987beb9c99ca806edc464518d411cc399fb4d (patch) | |
| tree | 51e2298b6eb7e6412009428b380a51e1f17b531b /kernel/trace/trace.c | |
| parent | faec2ec505d397e9426754722b6e80d519c4938f (diff) | |
| parent | 1fd8f2a3f9a91b287a876cef830b21baafc8a799 (diff) | |
| parent | feaf3848a813a106f163013af6fcf6c4bfec92d9 (diff) | |
Merge branches 'tracing/ftrace', 'tracing/function-graph-tracer' and 'tracing/urgent' into tracing/core