Merge branch 'tip/tracing/core4' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Wed, 16 Sep 2009 19:16:37 +0000 (21:16 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 16 Sep 2009 19:16:37 +0000 (21:16 +0200)

Trivial merge