From: Vladimir Sokolovsky <vlad@mellanox.com>
Date: Sun, 21 Jun 2015 13:04:53 +0000 (+0300)
Subject: Merge branch 'ofed_3_18' of git://flatbed.openfabrics.org/~tnikolova/docs/ into ofed_3_18
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=e8a83024014ad27e77c84056e16cda7ffd1e36db;p=~aditr%2Fcompat-rdma-docs.git

Merge branch 'ofed_3_18' of git://flatbed.openfabrics.org/~tnikolova/docs/ into ofed_3_18
---

e8a83024014ad27e77c84056e16cda7ffd1e36db