diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-18 08:52:13 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-18 08:52:13 +0100 |
| commit | 5a209c2d58e70f9bc415b9cdf0e3b9aaefb70371 (patch) | |
| tree | 02e63e90cc26792eaea21dced12bd7c10f996d30 /kernel | |
| parent | 3f8e402f34ecc7d1d00b54703d3baa401b8bdd78 (diff) | |
| parent | 0c726da983de0704254250ef6495ca152e7abcca (diff) | |
| parent | e270219f4372b58bd3eeac12bd9f7edc592b8f6b (diff) | |
Merge branches 'tracing/branch-tracer' and 'tracing/urgent' into tracing/core