| commit | ff0bc6cc7f20cfaf9aed4055773158f3f295b28b | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jan 21 17:42:55 2014 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jan 21 17:42:55 2014 -0800 |
| tree | ba968e3dc1fbdb730941fca5842b988fccba368c | |
| parent | 2182c815f3d430598e172c1c3ac88df775ea120e [diff] | |
| parent | ece35848c1847cdf3dd07954578d3e99238ebbae [diff] |
Merge tag 'dlm-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm Pull dlm update from David Teigland: "A single change to speed up recovery times when using SCTP connections" * tag 'dlm-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm: dlm: set zero linger time on sctp socket