Merge branches 'tracing/ftrace', 'tracing/function-graph-tracer' and 'tracing/urgent...
authorIngo Molnar <mingo@elte.hu>
Fri, 5 Dec 2008 13:45:22 +0000 (14:45 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 5 Dec 2008 13:45:22 +0000 (14:45 +0100)
commit970987beb9c99ca806edc464518d411cc399fb4d
tree51e2298b6eb7e6412009428b380a51e1f17b531b
parentfaec2ec505d397e9426754722b6e80d519c4938f
parent1fd8f2a3f9a91b287a876cef830b21baafc8a799
parentfeaf3848a813a106f163013af6fcf6c4bfec92d9
Merge branches 'tracing/ftrace', 'tracing/function-graph-tracer' and 'tracing/urgent' into tracing/core
block/blk-core.c
block/elevator.c
kernel/trace/trace.c
kernel/trace/trace.h