Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc7' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Wed, 4 Mar 2009 10:14:47 +0000 (11:14 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 4 Mar 2009 10:14:47 +0000 (11:14 +0100)

Trivial merge