From: Tony Lindgren <tony@atomide.com>
Date: Thu, 1 Mar 2012 23:20:00 +0000 (-0800)
Subject: Merge branch 'omap1' into ams-delta
X-Git-Tag: v3.4-rc1~88^2~6^2~5
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=42392762149cba0a74c1c5b1b1bb868d86e62383;p=~emulex%2Finfiniband.git

Merge branch 'omap1' into ams-delta
---

42392762149cba0a74c1c5b1b1bb868d86e62383