From: Sean Hefty <sean.hefty@intel.com>
Date: Wed, 18 Jun 2014 18:56:42 +0000 (-0700)
Subject: Merge branch 'dev'
X-Git-Tag: v1.0.19~17
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=106899eccc5fa61dd5e69c90bc0651ccd57e725f;p=~shefty%2Flibrdmacm.git

Merge branch 'dev'
---

106899eccc5fa61dd5e69c90bc0651ccd57e725f