Merge branch 'tip/tracing/ftrace' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Mon, 2 Mar 2009 21:38:31 +0000 (22:38 +0100)
committerIngo Molnar <mingo@elte.hu>
Mon, 2 Mar 2009 21:38:31 +0000 (22:38 +0100)

Trivial merge