From: Vladimir Sokolovsky <vlad@mellanox.com>
Date: Wed, 21 Jan 2015 15:41:48 +0000 (+0200)
Subject: Merge branch 'ofed_3_12' of git://git.openfabrics.org/~rupertd/docs/ into ofed_3_12
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7aa82a395486df307225c0e98f0e2c823787c48a;p=~aditr%2Fcompat-rdma-docs.git

Merge branch 'ofed_3_12' of git://git.openfabrics.org/~rupertd/docs/ into ofed_3_12

Conflicts:
	OFED_release_notes.txt
---

7aa82a395486df307225c0e98f0e2c823787c48a