Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Sat, 27 Feb 2010 09:41:16 +0000 (10:41 +0100)
committerIngo Molnar <mingo@elte.hu>
Sat, 27 Feb 2010 09:41:16 +0000 (10:41 +0100)

Trivial merge