From: Rupert Dance <rsdance@soft-forge.com>
Date: Sun, 25 May 2014 07:37:26 +0000 (-0700)
Subject: Merge branch 'ofed_3_12' of git://git.openfabrics.org/compat-rdma/docs into ofed_3_12
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b31b20c2a4daab69fea3b162c718318096ba2528;p=~tnikolova%2Fdocs%2F.git

Merge branch 'ofed_3_12' of git://git.openfabrics.org/compat-rdma/docs into ofed_3_12
---

b31b20c2a4daab69fea3b162c718318096ba2528