| commit | 956325bd55bb020e574129c443a2c2c66a8316e7 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jul 28 14:20:16 2015 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jul 28 14:20:16 2015 -0700 |
| tree | 0579ac8867a4ee219e7ed3cd87f0747fe97e55ee | |
| parent | d4ec1f181f962f1cce3a61928d16e439e83882d1 [diff] | |
| parent | b8f5595eb96c9fce1c907d13e89581e5061edf2e [diff] |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/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