commit 86e67a07d4dc8cd40454698f2abb972fced06910
author Linus Torvalds <torvalds@woody.linux-foundation.org> Tue Nov 27 14:20:51 2007 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Tue Nov 27 14:20:51 2007 -0800
tree d6c3fb4d8eef44f9bc1b0655085cb52b0d9e8da9
parent febb187761b02fce7d61b9c897d0e701f672b5ee
parent a316b79c3306c59176d7ae04e4aad12374dfed37

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/iser: Add missing counter increment in iser_data_buf_aligned_len()
  IB/ehca: Fix static rate regression
  mlx4_core: Fix state check in mlx4_qp_modify()
  IB/ipath: Normalize error return codes for posting work requests
  IB/ipath: Fix offset returned to ibv_modify_srq()
  IB/ipath: Fix error path in QP creation
  IB/ipath: Fix offset returned to ibv_resize_cq()