]> git.openfabrics.org - ~shefty/librdmacm.git/commitdiff
projects / ~shefty / librdmacm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ae8855 746c141 5879002)
pop (CONFLICT)
authorSean Hefty <sean.hefty@intel.com>
Thu, 18 Jul 2013 17:34:32 +0000 (10:34 -0700)
committerSean Hefty <sean.hefty@intel.com>
Thu, 18 Jul 2013 17:34:32 +0000 (10:34 -0700)

Trivial merge
RDMA CM