diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-29 11:25:11 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-29 11:25:11 +0100 |
| commit | 0f01f07fad4ee11d98fe6faa442afbeb0328a378 (patch) | |
| tree | 74140aedba4597718d270a5ccd74f0e38f32a22e /init | |
| parent | 3871f2ffe53db3cef4fe0c18993ad9e6e0f69408 (diff) | |
| parent | 412d0bb553c0227191f1bfd06100f561600bff22 (diff) | |
| parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) | |
| download | linux-0f01f07fad4ee11d98fe6faa442afbeb0328a378.tar.bz2 | |
Merge branches 'tracing/docs', 'tracing/function-graph-tracer' and 'linus' into tracing/core