Merge branch 'tip/tracing/core3' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Thu, 10 Dec 2009 07:18:41 +0000 (08:18 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 10 Dec 2009 07:18:41 +0000 (08:18 +0100)

Trivial merge