Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing...
authorIngo Molnar <mingo@elte.hu>
Fri, 6 Mar 2009 10:39:18 +0000 (11:39 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 6 Mar 2009 10:39:18 +0000 (11:39 +0100)
commit16097439703bcd38e9fe5608c12add6dacb825ea
tree9f6572fefdeb3e7c61f701ed9a86979d5525ccd8
parent40ada30f9621fbd831ac2437b9a2a399aad34b00
parent0012693ad4f636c720fed3802027f9427962f540
Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing/core
include/linux/ftrace.h