summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-01-21 17:42:55 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-21 17:42:55 -0800
commitff0bc6cc7f20cfaf9aed4055773158f3f295b28b (patch)
treeba968e3dc1fbdb730941fca5842b988fccba368c /kernel
parent2182c815f3d430598e172c1c3ac88df775ea120e (diff)
parentece35848c1847cdf3dd07954578d3e99238ebbae (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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions