Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 21 Jun 2011 17:36:06 +0000 (10:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 21 Jun 2011 17:36:06 +0000 (10:36 -0700)
commite08f6d4131ab964420f0bcabecc68d75fb49df79
treee1d2116899c4e0240d0c5ae4507f67ab801c91ee
parent890879cfa08f5ceaa09810611f46e890f7d57ff6
parentc7d74b090913102e7917dd02bb574ef060e1e930
Merge branch 'for-linus' of git://git./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