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

Trivial merge