]> git.openfabrics.org - ~aditr/compat-rdma-docs.git/commitdiff
projects / ~aditr / compat-rdma-docs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f63c718 22f50ef)
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)
Conflicts:
OFED_release_notes.txt


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.