From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 6 Jun 2012 17:45:21 +0000 (-0700)
Subject: Merge tag 'rdma-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
X-Git-Tag: v3.5-rc2~20
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=ae501be0f631bd4fb751c5f580e396f59b2011f1;p=linux-2.6-block.git

Merge tag 'rdma-fixes' of git://git./linux/kernel/git/roland/infiniband

Pull InfiniBand/RDMA fixes from Roland Dreier:
 "All in hardware drivers:
   - Fix crash in cxgb4
   - Fixes to new ocrdma driver
   - Regression fixes for mlx4"

* tag 'rdma-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/mlx4: Fix max_wqe capacity reported from query device
  mlx4_core: Fix setting VL_cap in mlx4_SET_PORT wrapper flow
  IB/mlx4: Fix EQ deallocation in legacy mode
  RDMA/cxgb4: Fix crash when peer address is 0.0.0.0
  RDMA/ocrdma: Remove unnecessary version.h includes
  RDMA/ocrdma: Fix signaled event for SRQ_LIMIT_REACHED
  RDMA/ocrdma: Correct queue free count math
---

ae501be0f631bd4fb751c5f580e396f59b2011f1