Merge branches 'tracing/ftrace' and 'tracing/function-graph-tracer' into tracing...
authorIngo Molnar <mingo@elte.hu>
Thu, 4 Dec 2008 08:07:44 +0000 (09:07 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 4 Dec 2008 08:07:44 +0000 (09:07 +0100)

Trivial merge