From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 22 Jan 2014 01:42:55 +0000 (-0800)
Subject: Merge tag 'dlm-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
X-Git-Tag: v3.14-rc1~139
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ff0bc6cc7f20cfaf9aed4055773158f3f295b28b;p=~emulex%2Finfiniband.git

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
---

ff0bc6cc7f20cfaf9aed4055773158f3f295b28b