From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 28 Mar 2007 21:00:01 +0000 (-0700)
Subject: Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
X-Git-Tag: v2.6.21-rc6~75
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a26b5fce06b92b2f02967d4c845fa628024e5414;p=~emulex%2Finfiniband.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:
  IB/iser: Handle aborting a command after it is sent
  IB/mthca: Fix thinko in init_mr_table()
  RDMA/cxgb3: Fix resource leak in cxio_hal_init_ctrl_qp()
---

a26b5fce06b92b2f02967d4c845fa628024e5414