]> git.openfabrics.org - ~shefty/librdmacm.git/commitdiff
projects / ~shefty / librdmacm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3a065d4 ab2929d 03b25dd)
pop (CONFLICT)
authorSean Hefty <sean.hefty@intel.com>
Tue, 14 Aug 2012 22:53:35 +0000 (15:53 -0700)
committerSean Hefty <sean.hefty@intel.com>
Tue, 14 Aug 2012 22:53:35 +0000 (15:53 -0700)

Trivial merge
RDMA CM