Merge branch 'tracing/ftrace' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Sat, 28 Feb 2009 08:02:49 +0000 (09:02 +0100)
committerIngo Molnar <mingo@elte.hu>
Sat, 28 Feb 2009 08:02:49 +0000 (09:02 +0100)

Trivial merge