diff options
| author | Ingo Molnar | 2008-11-13 09:48:03 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2008-11-13 09:48:03 +0100 |
| commit | 24de38620dd3504782c90c0892eef888d0c351e9 (patch) | |
| tree | 6de8d1a9785fc4b38287f8f3509015fdcbbaedff /kernel | |
| parent | 94b80ffd650b22e1fd493ccf6bad7efda4b8ea85 (diff) | |
| parent | 68f96c0c889b55bf62eee98e859cb686f8850188 (diff) | |
| parent | 1dc1c6adf38bc5799d1594681645ced40ced4b6b (diff) | |
| parent | 47e74f2ba8fbf9fb1378e2524e6cfdc2fb37f160 (diff) | |
Merge branches 'tracing/branch-tracer', 'tracing/fastboot', 'tracing/function-return-tracer' and 'tracing/urgent' into tracing/core