From: H. Peter Anvin <hpa@zytor.com>
Date: Mon, 21 May 2012 19:17:50 +0000 (-0700)
Subject: Merge commit 'v3.4' into x86/urgent
X-Git-Tag: v3.5-rc1~129^2~1
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d13a822e6d08733cc69dd8c2f5d82eacb1474295;p=~emulex%2Finfiniband.git

Merge commit 'v3.4' into x86/urgent
---

d13a822e6d08733cc69dd8c2f5d82eacb1474295