From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sun, 17 Sep 2006 04:35:15 +0000 (-0700)
Subject: Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
X-Git-Tag: v2.6.18~14^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=35e4ddfc86df84d32fbd2b9ae3b0b0408afb7e3f;p=linux-2.6-omap-h63xx.git

Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
  RDMA/cma: Increase the IB CM retry count in CMA
  IPoIB: Retry failed send-only multicast group joins
  IB/srp: Don't schedule reconnect from srp
---

35e4ddfc86df84d32fbd2b9ae3b0b0408afb7e3f