Merge branches 'tracing/ftrace' and 'linus' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Fri, 27 Feb 2009 08:04:43 +0000 (09:04 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 27 Feb 2009 08:04:43 +0000 (09:04 +0100)

Trivial merge