diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-11-24 17:46:24 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-11-24 17:46:24 +0100 |
commit | 6f893fb2e89287a4d755f928c3cda9d18440355c (patch) | |
tree | e2b2d9b3974567bc25a5298b14660062d6afb871 /kernel/trace | |
parent | 0429149fb5e01edc410648591c19095d2074ee00 (diff) | |
parent | 1d926f2756392c6909f60e0c9fe2a09d5462e376 (diff) | |
parent | 69bb54ec05f57da7f6fac2cec0820cbc970df20f (diff) | |
parent | 65afa5e603d507014580ead016ec887b49e1afa6 (diff) | |
parent | cbe2f5a6e84eebb98ab42fc5e58c3cd5b7767349 (diff) | |
parent | 813b8520f5c240c71df55d14095a7b171de264ce (diff) | |
parent | 033601a32b2012b6948e80e739cca40bff4de4a0 (diff) | |
parent | 958086d1784459be3fe85e4cad79d42b17d33381 (diff) | |
parent | fb91ee6cf5b8be5360acec577458e29ec7e97e5e (diff) |
Merge branches 'tracing/branch-tracer', 'tracing/fastboot', 'tracing/ftrace', 'tracing/function-return-tracer', 'tracing/power-tracer', 'tracing/powerpc', 'tracing/ring-buffer', 'tracing/stack-tracer' and 'tracing/urgent' into tracing/core