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)
commitc16dbd54a3fe126b539a0ef149d80221c667bbd5
tree297a9b616ac100d8773373bd0cbf3fb4eb9d87a7
parent257313b2a87795e07a0bdf58d0fffbdba8b31051
parentc5fc472171ec4f96d06d1ac039d88f9b89bb95db
Merge branch 'perf/core' into perf/urgent

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>