Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Sat, 29 Aug 2009 11:06:05 +0000 (13:06 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 29 Aug 2009 11:06:05 +0000 (13:06 +0200)

Trivial merge