summaryrefslogtreecommitdiffstats
path: root/block
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
parentfaec2ec505d397e9426754722b6e80d519c4938f (diff)
parent1fd8f2a3f9a91b287a876cef830b21baafc8a799 (diff)
parentfeaf3848a813a106f163013af6fcf6c4bfec92d9 (diff)
downloadlinux-970987beb9c99ca806edc464518d411cc399fb4d.tar.bz2
Merge branches 'tracing/ftrace', 'tracing/function-graph-tracer' and 'tracing/urgent' into tracing/core