Merge branch 'tip/tracing/ftrace-4' of git://git.kernel.org/pub/scm/linux/kernel...
authorIngo Molnar <mingo@elte.hu>
Fri, 5 Jun 2009 14:50:29 +0000 (16:50 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 5 Jun 2009 14:50:29 +0000 (16:50 +0200)

Trivial merge