Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorIngo Molnar <mingo@elte.hu>
Wed, 22 Dec 2010 11:46:12 +0000 (12:46 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 22 Dec 2010 16:12:08 +0000 (17:12 +0100)

Trivial merge