Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 May 2014 00:52:42 +0000 (17:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 May 2014 00:52:42 +0000 (17:52 -0700)
commitb7270cce7db770602510043b212992d839fd25a6
treebb9ce83191b9461719c6f8ea54ec8d2d150b5db1
parentb5f3c61d06165c3dddddbc30772f079c2c8589ca
parent7d0a73a40c5ceb7524aa6a43f108de0dd8dbe3f0
Merge tag 'rdma-for-linus' of git://git./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