Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
authorIngo Molnar <mingo@elte.hu>
Fri, 28 Aug 2009 11:53:07 +0000 (13:53 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 28 Aug 2009 11:53:07 +0000 (13:53 +0200)

Trivial merge