tree d944d7cefc2416f3aae8c733b678c43ac0f6bd46
parent cad46744a308299e1c33a549e3e9c9a5bc468f05
parent 17859d07c89165a54a5cf6beb7f068b140660892
author Linus Torvalds <torvalds@linux-foundation.org> 1284047932 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1284047932 -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/nes: Fix hang with modified FIN handling on A0 cards
  RDMA/nes: Change state to closing after FIN
  RDMA/nes: Fix double CLOSE event indication crash
  RDMA/nes: Write correct register write to set TX pause param
  RDMA/cxgb3: Don't exceed the max HW CQ depth