tree f69a819d83453d2067958153270a1bfb1997b239
parent 74239072830ef3f1398edeb1bc1076fc330fd4a2
parent 642edba5f5c545772b89907cf96134c73d6073c7
author Ingo Molnar <mingo@elte.hu> 1226487051 +0100
committer Ingo Molnar <mingo@elte.hu> 1226487051 +0100

Merge branches 'tracing/fastboot', 'tracing/function-return-tracer' and 'tracing/ring-buffer' into tracing/core