From: Roland Dreier <roland@purestorage.com>
Date: Mon, 19 Mar 2012 16:50:33 +0000 (-0700)
Subject: Merge branches 'cma', 'cxgb3', 'cxgb4', 'ehca', 'iser', 'mad', 'nes', 'qib', 'srp... 
X-Git-Tag: v3.4-rc1~169^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=f0e88aeb19dac00ed2e09fd4d39ee65f32d5e968;p=~emulex%2Finfiniband.git

Merge branches 'cma', 'cxgb3', 'cxgb4', 'ehca', 'iser', 'mad', 'nes', 'qib', 'srp' and 'srpt' into for-next
---

f0e88aeb19dac00ed2e09fd4d39ee65f32d5e968