Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux...
Ingo Molnar [Fri, 5 Aug 2011 08:35:55 +0000 (10:35 +0200)]

Trivial merge