diff options
author | 2008-12-05 14:45:22 +0100 | |
---|---|---|
committer | 2008-12-05 14:45:22 +0100 | |
commit | 970987beb9c99ca806edc464518d411cc399fb4d (patch) | |
tree | 51e2298b6eb7e6412009428b380a51e1f17b531b /include | |
parent | ftrace: avoid duplicated function when writing set_graph_function (diff) | |
parent | tracing/function-graph-tracer: handle ftrace_printk entries (diff) | |
parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff) | |
download | linux-dev-970987beb9c99ca806edc464518d411cc399fb4d.tar.xz linux-dev-970987beb9c99ca806edc464518d411cc399fb4d.zip |
Merge branches 'tracing/ftrace', 'tracing/function-graph-tracer' and 'tracing/urgent' into tracing/core