From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 28 Jul 2015 21:20:16 +0000 (-0700)
Subject: Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma
X-Git-Tag: firefly_0821_release~176^2~1349
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=956325bd55bb020e574129c443a2c2c66a8316e7;p=firefly-linux-kernel-4.4.55.git

Merge tag 'for-linus' of git://git./linux/kernel/git/dledford/rdma

Pull rdma fixes from Doug Ledford:

 - two minor bug fixes

 - relicense ocrdma driver to dual license, GPL or BSD

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
  RDMA/ocrdma: update ocrdma module license string
  RDMA/ocrdma: update ocrdma license to dual-license
  IB/ipoib: Fix CONFIG_INFINIBAND_IPOIB_CM
  RDMA/cxgb3: fail get_dma_mr on 64 bit arches
---

956325bd55bb020e574129c443a2c2c66a8316e7