Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing...
commit5ce1b1ed27d4ab1d81b8543a96f488bba2071576
authorIngo Molnar <mingo@elte.hu>
Mon, 26 Jan 2009 13:01:52 +0000 (26 14:01 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 26 Jan 2009 13:01:52 +0000 (26 14:01 +0100)
tree6124a034fce0277570e5f10699337e20b564cbd1
parent7e49fcce1bdadd723ae6a0b3b324c4daced61563
parent9005f3ebebfcfe9ccd731d16c468907a35ac1f9a
Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing/core