]> git.openfabrics.org - ~shefty/librdmacm.git/commitdiff
projects / ~shefty / librdmacm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5f242d3 04d0358 3fcc4b4)
pop (CONFLICT)
authorSean Hefty <sean.hefty@intel.com>
Wed, 18 Jul 2012 18:31:15 +0000 (11:31 -0700)
committerSean Hefty <sean.hefty@intel.com>
Wed, 18 Jul 2012 18:31:15 +0000 (11:31 -0700)

Trivial merge
RDMA CM