diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-01 17:52:42 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-01 17:52:42 -0700 |
commit | b7270cce7db770602510043b212992d839fd25a6 (patch) | |
tree | bb9ce83191b9461719c6f8ea54ec8d2d150b5db1 /arch/s390 | |
parent | b5f3c61d06165c3dddddbc30772f079c2c8589ca (diff) | |
parent | 7d0a73a40c5ceb7524aa6a43f108de0dd8dbe3f0 (diff) | |
download | linux-b7270cce7db770602510043b212992d839fd25a6.tar.gz linux-b7270cce7db770602510043b212992d839fd25a6.tar.bz2 linux-b7270cce7db770602510043b212992d839fd25a6.zip |
Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
Pull infiniband/rdma fixes from Roland Dreier:
"cxgb4 hardware driver fixes"
* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
RDMA/cxgb4: Update Kconfig to include Chelsio T5 adapter
RDMA/cxgb4: Only allow kernel db ringing for T4 devs
RDMA/cxgb4: Force T5 connections to use TAHOE congestion control
RDMA/cxgb4: Fix endpoint mutex deadlocks
Diffstat (limited to 'arch/s390')
0 files changed, 0 insertions, 0 deletions