diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-27 12:56:13 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-27 12:56:13 +0300 |
| commit | c7cc77307669336a08928ab8668bdb3f3bcc021b (patch) | |
| tree | c9f2997a7266cc5d8c5b61e964d8e014f274f5d3 /fs | |
| parent | 0bfc24559d7945506184d86739fe365a181f06b7 (diff) | |
| parent | d144d5ee6a265823d39f75ecfed351a516295183 (diff) | |
| parent | 437f24fb897d409a9978eb71ecfaf279dcd94acd (diff) | |
| parent | f3f47a6768a29448866da4422b6f6bee485c947f (diff) | |
| download | linux-c7cc77307669336a08928ab8668bdb3f3bcc021b.tar.xz | |
Merge branches 'tracing/blktrace', 'tracing/ftrace', 'tracing/function-graph-tracer' and 'tracing/power-tracer' into tracing/core