tree 6a6b416c76c0e1a569af5531454fb45fe06e07ba
parent 66eafebc1086014709dc38f52ddcb3d67d9b346c
parent 48d68b20d00865035b8b65e69af343d0f53fac9d
author Ingo Molnar <mingo@elte.hu> 1228290561 +0100
committer Ingo Molnar <mingo@elte.hu> 1228290561 +0100

Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing/core