Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorIngo Molnar <mingo@elte.hu>
Tue, 6 Dec 2011 18:09:15 +0000 (19:09 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 6 Dec 2011 18:09:15 +0000 (19:09 +0100)

Trivial merge