Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc2' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Sun, 18 Jan 2009 19:15:05 +0000 (20:15 +0100)
committerIngo Molnar <mingo@elte.hu>
Sun, 18 Jan 2009 19:15:05 +0000 (20:15 +0100)

Trivial merge