diff options
author | Linus Torvalds | 2006-09-17 06:35:15 +0200 |
---|---|---|
committer | Linus Torvalds | 2006-09-17 06:35:15 +0200 |
commit | 35e4ddfc86df84d32fbd2b9ae3b0b0408afb7e3f (patch) | |
tree | 91a9a27ca6aabd7f1ba57112029b662a9ee3d109 /arch/i386/oprofile/nmi_int.c | |
parent | [PATCH] JFFS2: SUMMARY: fix a summary collecting bug (diff) | |
parent | RDMA/cma: Increase the IB CM retry count in CMA (diff) | |
download | kernel-qcow2-linux-35e4ddfc86df84d32fbd2b9ae3b0b0408afb7e3f.tar.gz kernel-qcow2-linux-35e4ddfc86df84d32fbd2b9ae3b0b0408afb7e3f.tar.xz kernel-qcow2-linux-35e4ddfc86df84d32fbd2b9ae3b0b0408afb7e3f.zip |
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
Diffstat (limited to 'arch/i386/oprofile/nmi_int.c')
0 files changed, 0 insertions, 0 deletions