Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Tue, 10 Feb 2009 12:58:28 +0000 (13:58 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 10 Feb 2009 12:58:28 +0000 (13:58 +0100)

Trivial merge