Merge branches 'tracing/function-graph-tracer' and 'tracing/ring-buffer' into tracing...
Ingo Molnar [Fri, 12 Dec 2008 06:40:08 +0000 (07:40 +0100)]

Trivial merge