diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-16 12:03:38 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-16 12:03:38 +0100 |
| commit | 9dfc3bc7d21864d47797d64b8d531d4dbbc0b618 (patch) | |
| tree | fdf0eb86fdb7a7ecfb4f7bc718ac26875f3f94a2 /kernel | |
| parent | da485e0cb16726797e99a595a399b9fc721b91bc (diff) | |
| parent | cbc34ed1ac36690f75fd272e19e7b4fc29aae5a2 (diff) | |
| parent | 2bed8446819a7c5033aa1da138d9f230ae212edc (diff) | |
| parent | ffc2238af8431d930d2c15f16feecf1fd6d75642 (diff) | |
Merge branches 'tracing/fastboot', 'tracing/ftrace', 'tracing/function-graph-tracer' and 'tracing/hw-branch-tracing' into tracing/core