Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc6' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Tue, 24 Feb 2009 17:22:39 +0000 (18:22 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 24 Feb 2009 17:22:39 +0000 (18:22 +0100)

Trivial merge