Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme...
Ingo Molnar [Sat, 4 Jun 2011 10:13:06 +0000 (12:13 +0200)]
1  2 
kernel/events/core.c

Simple merge