tree c62149d0fca8a0261423b6e0158f186ae91b09c4
parent bba6f6fc68e74d4572028646f61dd3505a68747e
parent 3104a2175dc04b7a597acea90f19b033abcfc7d8
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1175115601 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1175115601 -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:
  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()