diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-20 10:14:53 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-20 10:14:53 +0100 |
| commit | 22de89b371a18086162eacd9f8c960299334ab01 (patch) | |
| tree | 518227dde7ba892413163b32341c5d319da13949 /kernel/trace | |
| parent | 3bf832ce1fe6988148d392599f34ca0c6a34427d (diff) | |
| parent | f02b8624fedca39886b0eef770dca70c2f0749b3 (diff) | |
| parent | a635cf0497342978d417cae19d4a4823932977ff (diff) | |
| parent | 65c24491b4fef017c64e39ec64384fde5e05e0a0 (diff) | |
Merge branches 'tracing/ftrace', 'tracing/kprobes', 'tracing/tasks' and 'linus' into tracing/core