]> git.openfabrics.org - compat-rdma/docs.git/commit
Merge branch 'ofed_3_12' of git://git.openfabrics.org/~rupertd/docs/ into ofed_3_12 ofed_3_12
authorVladimir Sokolovsky <vlad@mellanox.com>
Wed, 21 Jan 2015 15:41:48 +0000 (17:41 +0200)
committerVladimir Sokolovsky <vlad@mellanox.com>
Wed, 21 Jan 2015 15:41:48 +0000 (17:41 +0200)
commit7aa82a395486df307225c0e98f0e2c823787c48a
tree0a4142e28a8560e52d98601162a2661ced6cbe96
parentf63c718d7d6eeb158f07f0924826680cda0f314d
parent22f50ef8181be1bd7f02f9cc3dff72ee7c8bd879
Merge branch 'ofed_3_12' of git://git.openfabrics.org/~rupertd/docs/ into ofed_3_12

Conflicts:
OFED_release_notes.txt