tree ddfdb65a1c857a1c1647dce3070ee930c23aea10
parent e9ed7e722e3f4cea07cf3c4bfe98c18180a17793
parent e2f81daf23efde23d8cac1fc253d41838f0347cf
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1185129917 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1185129917 -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: Support small QP queues
  IB/ehca: Make internal_create/destroy_qp() static
  IB/ehca: Move ehca2ib_return_code() out of line
  IB/ehca: Generate async event when SRQ limit reached
  IB/ehca: Support large page MRs
  IB/mlx4: Fix error path in create_qp_common()
  mlx4_core: Change command token on timeout
  IB/mthca: Change command token on timeout
  IB/ipath: Remove ipath_layer dead code
  IB/mlx4: Fix leaks in __mlx4_ib_modify_qp