Merge branch 'tracing/ftrace' into tracing/function-return-tracer
authorIngo Molnar <mingo@elte.hu>
Sun, 16 Nov 2008 06:57:13 +0000 (07:57 +0100)
committerIngo Molnar <mingo@elte.hu>
Sun, 16 Nov 2008 06:57:13 +0000 (07:57 +0100)

Trivial merge