pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff

author	Linus Torvalds <torvalds@linux-foundation.org>
	Wed, 14 May 2008 20:32:43 +0000 (13:32 -0700)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Wed, 14 May 2008 20:32:43 +0000 (13:32 -0700)

* '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

Trivial merge