tree 6752c13edb19fb4d992d0202b0c2276d6734b373
parent b8307db2477f9c551e54e0c7b643ea349a3349cd
parent e8e1abe92fd7ea9d823a3aaf81d10e2cba593b6b
parent 764f3b95131a7ce5c992e3d00caf590fcada2f7b
author Ingo Molnar <mingo@elte.hu> 1228378064 +0100
committer Ingo Molnar <mingo@elte.hu> 1228378064 +0100

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