Merge branch 'tracing/ftrace' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Thu, 5 Mar 2009 09:20:47 +0000 (10:20 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 5 Mar 2009 09:20:47 +0000 (10:20 +0100)

Trivial merge