tree b5d2feab6211ee987fb30bca35493fd6569003bb
parent a41d7f000447015f3f5fe7223f1d53845268e2e8
parent 2dfbfc37121d307e1f1d24c2979382cb17b19347
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1180133396 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1180133396 -0700

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