Merge branch 'tip/tracing/ftrace' of ssh://master.kernel.org/pub/scm/linux/kernel...
authorIngo Molnar <mingo@elte.hu>
Thu, 26 Feb 2009 02:48:44 +0000 (03:48 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 26 Feb 2009 02:48:44 +0000 (03:48 +0100)

Trivial merge