Merge branch 'perf/urgent' into perf/core
authorIngo Molnar <[email protected]>
Wed, 6 Jun 2012 15:00:37 +0000 (17:00 +0200)
committerIngo Molnar <[email protected]>
Wed, 6 Jun 2012 15:22:57 +0000 (17:22 +0200)
Eliminate a conflict in a patch I am going to apply.

Signed-off-by: Ingo Molnar <[email protected]>

Trivial merge