]> git.openfabrics.org - ~shefty/librdmacm.git/commitdiff
projects / ~shefty / librdmacm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 29155a7 e545856 c4cb6ff)
pop (CONFLICT)
authorSean Hefty <sean.hefty@intel.com>
Wed, 25 Jul 2012 18:53:29 +0000 (11:53 -0700)
committerSean Hefty <sean.hefty@intel.com>
Wed, 25 Jul 2012 18:53:29 +0000 (11:53 -0700)

Trivial merge
RDMA CM