Merge branch 'tip/tracing/core-7' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Fri, 21 May 2010 15:53:06 +0000 (17:53 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 21 May 2010 15:53:46 +0000 (17:53 +0200)

Trivial merge