summaryrefslogtreecommitdiff
path: root/kernel/trace
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-04 09:07:44 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-04 09:07:44 +0100
commitb29144c317fb748dae6d72c0f88eda9d43165b8d (patch)
tree6752c13edb19fb4d992d0202b0c2276d6734b373 /kernel/trace
parentb8307db2477f9c551e54e0c7b643ea349a3349cd (diff)
parente8e1abe92fd7ea9d823a3aaf81d10e2cba593b6b (diff)
parent764f3b95131a7ce5c992e3d00caf590fcada2f7b (diff)
Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing/core