diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 12:25:18 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 12:25:18 +0300 |
| commit | 1c511f740fe7031867f51831854360e8be1ba34c (patch) | |
| tree | bd678fbc8117f751a3d1f8dc93b91c215ceaf66f | |
| parent | e7669b8e329255bbcb40af65b38e342825d97a46 (diff) | |
| parent | 00f62f614bb713027b9296068d1879fbca511eb7 (diff) | |
| parent | b22f4858126a6aa852ad745b94f6b25dbdea708e (diff) | |
| parent | 071a0bc2ceace31266836801510879407a3701fa (diff) | |
| download | linux-1c511f740fe7031867f51831854360e8be1ba34c.tar.xz | |
Merge branches 'tracing/ftrace', 'tracing/ring-buffer', 'tracing/sysprof', 'tracing/urgent' and 'linus' into tracing/core