diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-19 10:20:17 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-19 10:20:17 +0100 |
| commit | 40999096e8b9872199bf56ecd0c4d98397ccaf2f (patch) | |
| tree | a1019965100c10cae52014c447bfb4d1381ebec9 /kernel/trace | |
| parent | 72c26c9a26ea7f2f3d14f162c2ebb07805f724ea (diff) | |
| parent | fa7c7f6e11f70d62505074a8b30a776236850dec (diff) | |
| parent | ed4a2f374d71770796789ed559c35a36bab82f1a (diff) | |
Merge branches 'tracing/blktrace', 'tracing/ftrace' and 'tracing/urgent' into tracing/core