From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 13 Mar 2010 22:38:31 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland... 
X-Git-Tag: 2.1b_release~8886
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=122ce878dc189860a380539bde19498bf93443a7;p=platform%2Fkernel%2Fkernel-mfld-blackbay.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:
  RDMA/nes: Fix CX4 link problem in back-to-back configuration
  RDMA/nes: Clear stall bit before destroying NIC QP
  RDMA/nes: Set assume_aligned_header bit
  RDMA/cxgb3: Wait at least one schedule cycle during device removal
  IB/mad: Ignore iWARP devices on device removal
  IPoIB: Include return code in trace message for ib_post_send() failures
  IPoIB: Fix TX queue lockup with mixed UD/CM traffic
---

122ce878dc189860a380539bde19498bf93443a7