Merge branch 'perf/core' into perf/urgent
authorIngo Molnar <mingo@elte.hu>
Fri, 20 May 2011 06:54:05 +0000 (08:54 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 20 May 2011 06:54:08 +0000 (08:54 +0200)
Merge reason: One pending commit was left in perf/core after Linus merged
              perf/core - continue v2.6.40 work in the perf/urgent reason.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Trivial merge