From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Mon, 21 May 2012 14:12:39 +0000 (-0400)
Subject: Merge branch 'bugfixes' into nfs-for-next
X-Git-Tag: v3.5-rc1~52^2~45
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b3f87b98aa3dc22cc58f970140113b270015cddb;p=~emulex%2Finfiniband.git

Merge branch 'bugfixes' into nfs-for-next
---

b3f87b98aa3dc22cc58f970140113b270015cddb