tree 0df2e2aeb3d2ac7ba8deb4352e83cf8d306a91aa
parent ddc752a4068088bfc5558a3f72e4f7cca3fc1210
parent 3a3eae0d66591572f771b9383e96ecacacee0abd
author Linus Torvalds <torvalds@linux-foundation.org> 1218584325 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1218584325 -0700

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/ehca: Discard double CQE for one WR
  IB/ehca: Check idr_find() return value
  IB/ehca: Repoll CQ on invalid opcode
  IB/ehca: Rename goto label in ehca_poll_cq_one()
  IB/ehca: Update qp_state on cached modify_qp()
  IPoIB/cm: Use vmalloc() to allocate rx_rings