From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Jun 2014 14:41:57 +0000 (-0700)
Subject: Merge tag 'dlm-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
X-Git-Tag: v4.9.8~6236
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4bdeb312083e65fccbb0a4b4043568f60520c67a;p=platform%2Fkernel%2Flinux-rpi3.git

Merge tag 'dlm-3.16' of git://git./linux/kernel/git/teigland/linux-dlm

Pull dlm fix from David Teigland:
 "This contains one small fix related to resending SCTP messages"

* tag 'dlm-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  dlm: keep listening connection alive with sctp mode
---

4bdeb312083e65fccbb0a4b4043568f60520c67a