From: Roland Dreier <roland@purestorage.com>
Date: Thu, 16 Aug 2012 16:38:39 +0000 (-0700)
Subject: Merge branches 'cma', 'ipoib', 'misc', 'mlx4', 'ocrdma', 'qib' and 'srp' into for... 
X-Git-Tag: v3.6-rc3~36^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c0369b296e839beccd20ffe21b52940eaf1bd9fc;p=~emulex%2Finfiniband.git

Merge branches 'cma', 'ipoib', 'misc', 'mlx4', 'ocrdma', 'qib' and 'srp' into for-next
---

c0369b296e839beccd20ffe21b52940eaf1bd9fc