From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 25 May 2007 22:49:56 +0000 (-0700)
Subject: Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
X-Git-Tag: v2.6.22-rc3~2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1ea0975875294964853209927feccdf6bc8cf5f9;p=linux-2.6-omap-h63xx.git

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

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
  IPoIB/cm: Drain cq in ipoib_cm_dev_stop()
  IPoIB/cm: Fix timeout check in ipoib_cm_dev_stop()
  IB/ehca: Fix number of send WRs reported for new QP
  IB/mlx4: Initialize send queue entry ownership bits
  IB/mlx4: Don't allocate RQ doorbell if using SRQ
---

1ea0975875294964853209927feccdf6bc8cf5f9