tree 3d3c13ebab12e7e5768c062a31b3a6c7aa72f004
parent 4717df58304b60ac26cdb157d57f39ae1e3a336f
parent a58e58fafdff4c25949221e46132e86f709d0b79
author Linus Torvalds <torvalds@linux-foundation.org> 1210797163 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1210797163 -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:
  RDMA/cxgb3: Wrap the software send queue pointer as needed on flush
  IB/ipath: Change ipath_devdata.ipath_sdma_status to be unsigned long
  IB/ipath: Make ipath_portdata work with struct pid * not pid_t
  IB/ipath: Fix RDMA read response sequence checking
  IB/ipath: Fix many locking issues when switching to error state
  IB/ipath: Fix RC and UC error handling
  RDMA/nes: Fix up nes_lro_max_aggr module parameter