Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
authorIngo Molnar <mingo@kernel.org>
Wed, 9 May 2012 17:34:30 +0000 (19:34 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 9 May 2012 17:34:30 +0000 (19:34 +0200)

Trivial merge