Merge branch 'tracing/ftrace' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Thu, 4 Jun 2009 11:59:26 +0000 (13:59 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 4 Jun 2009 11:59:40 +0000 (13:59 +0200)
Merge reason: this mini-topic had outstanding problems that delayed
              its merge, so it does not fast-forward.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Trivial merge