arent 1c80025a49855b12fa09bb6db71820e3367b1369
author Ingo Molnar <mingo@elte.hu> 1226818633 +0100
committer Ingo Molnar <mingo@elte.hu> 1226818633 +0100

Merge branch 'tracing/ftrace' into tracing/function-return-tracer
¢h`