tree e1d2116899c4e0240d0c5ae4507f67ab801c91ee
parent 890879cfa08f5ceaa09810611f46e890f7d57ff6
parent c7d74b090913102e7917dd02bb574ef060e1e930
author Linus Torvalds <torvalds@linux-foundation.org> 1308677766 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1308677766 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/qib: Ensure that LOS and DFE are being turned off
  RDMA/cxgb4: Couple of abort fixes
  RDMA/cxgb4: Don't truncate MR lengths
  RDMA/cxgb4: Don't exceed hw IQ depth limit for user CQs