Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 12 Apr 2007 22:44:52 +0000 (15:44 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 12 Apr 2007 22:44:52 +0000 (15:44 -0700)
commit8a065975c1c00d1ab3293c1adf6f89988bb1b03b
tree8835a41620cf6f6b955a444fa7e4503a05143d1a
parent0ea41a26baa7ef10bc8de72f9ed571dc677780bc
parent1ca19770c5ba90d041ba4d06976c77048d330cc8
Merge branch 'for-linus' of /linux/kernel/git/roland/infiniband

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
  RDMA/cxgb3: Add set_tcb_rpl_handler