diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-17 03:36:22 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-17 03:36:22 -0500 |
| commit | 3f8e402f34ecc7d1d00b54703d3baa401b8bdd78 (patch) | |
| tree | b1f515a1c5426809c076dd854f9385efb750683b /kernel | |
| parent | 072b40a15616fe6bea68466e6bffcfcbf5c8f26f (diff) | |
| parent | e7d3737ea1b102030f44e96c97754101e41515f0 (diff) | |
| parent | 227a837567e339c74d9d4243d03a29bd943a018c (diff) | |
| parent | 5821e1b74f0d08952cb5da4bfd2d9a388d8df58e (diff) | |
Merge branches 'tracing/branch-tracer', 'tracing/ftrace', 'tracing/function-return-tracer', 'tracing/tracepoints' and 'tracing/urgent' into tracing/core