| commit | 35e4ddfc86df84d32fbd2b9ae3b0b0408afb7e3f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Sat Sep 16 21:35:15 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Sat Sep 16 21:35:15 2006 -0700 |
| tree | 91a9a27ca6aabd7f1ba57112029b662a9ee3d109 | |
| parent | 27bea3275515e5bd748ed7a492d0df605f5e824a [diff] | |
| parent | d5bb75999cb5733ad936ff000023221fe7a13c59 [diff] |
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