| commit | 4bdeb312083e65fccbb0a4b4043568f60520c67a | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 13 07:41:57 2014 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jun 13 07:41:57 2014 -0700 |
| tree | ed123e56179e3c28e37da57942bb3eabc7bebb3a | |
| parent | aa569fa0ea32d1c24fb801a07d2d9174cbbdde23 [diff] | |
| parent | 883854c5457a97190f7b0ee20f03bcd9664fc0c2 [diff] |
Merge tag 'dlm-3.16' of git://git.kernel.org/pub/scm/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