From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 21 Jun 2011 17:36:06 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland... 
X-Git-Tag: v3.0-rc5~52
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e08f6d4131ab964420f0bcabecc68d75fb49df79;p=profile%2Fivi%2Fkernel-x86-ivi.git

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
---

e08f6d4131ab964420f0bcabecc68d75fb49df79