From: Ingo Molnar Date: Fri, 20 May 2011 06:54:05 +0000 (+0200) Subject: Merge branch 'perf/core' into perf/urgent X-Git-Tag: v3.0-rc1~381^2~1 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c16dbd54a3fe126b539a0ef149d80221c667bbd5;p=~emulex%2Finfiniband.git 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 --- c16dbd54a3fe126b539a0ef149d80221c667bbd5