Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Wed, 25 Feb 2009 11:50:07 +0000 (12:50 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 25 Feb 2009 11:50:07 +0000 (12:50 +0100)

Trivial merge