Merge branch 'rfc/splice/tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux...
authorIngo Molnar <mingo@elte.hu>
Wed, 4 Mar 2009 10:15:42 +0000 (11:15 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 4 Mar 2009 10:15:42 +0000 (11:15 +0100)

Trivial merge