summaryrefslogtreecommitdiffstats
path: root/block/blk-core.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-05 14:45:22 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-05 14:45:22 +0100
commit970987beb9c99ca806edc464518d411cc399fb4d (patch)
tree51e2298b6eb7e6412009428b380a51e1f17b531b /block/blk-core.c
parentftrace: avoid duplicated function when writing set_graph_function (diff)
parenttracing/function-graph-tracer: handle ftrace_printk entries (diff)
parentMerge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff)
downloadlinux-970987beb9c99ca806edc464518d411cc399fb4d.tar.xz
linux-970987beb9c99ca806edc464518d411cc399fb4d.zip
Merge branches 'tracing/ftrace', 'tracing/function-graph-tracer' and 'tracing/urgent' into tracing/core