Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux...
Ingo Molnar [Sun, 14 Aug 2011 09:48:29 +0000 (11:48 +0200)]

Trivial merge