From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 1 Jun 2009 08:01:03 +0000 (+0200)
Subject: Merge branch 'linus' into perfcounters/core
X-Git-Tag: v2.6.31-rc1~383^2~146
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=23db9f430be9325a861c7762c1ffadad9ca528a8;p=~emulex%2Finfiniband.git

Merge branch 'linus' into perfcounters/core

Merge reason: merge almost-rc8 into perfcounters/core, which was -rc6
              based - to pick up the latest upstream fixes.

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

23db9f430be9325a861c7762c1ffadad9ca528a8