]> git.openfabrics.org - ~shefty/libibverbs.git/commitdiff
pop (CONFLICT)
authorSean Hefty <sean.hefty@intel.com>
Wed, 26 Sep 2012 16:00:07 +0000 (09:00 -0700)
committerSean Hefty <sean.hefty@intel.com>
Wed, 26 Sep 2012 16:00:07 +0000 (09:00 -0700)

Trivial merge