Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
Ingo Molnar [Thu, 17 Feb 2011 13:11:15 +0000 (14:11 +0100)]

Trivial merge