Merge tag 'dlm-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 22 Jan 2014 01:42:55 +0000 (17:42 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 22 Jan 2014 01:42:55 +0000 (17:42 -0800)
commitff0bc6cc7f20cfaf9aed4055773158f3f295b28b
treeba968e3dc1fbdb730941fca5842b988fccba368c
parent2182c815f3d430598e172c1c3ac88df775ea120e
parentece35848c1847cdf3dd07954578d3e99238ebbae
Merge tag 'dlm-3.14' of git://git./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