diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-13 14:41:57 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-13 14:41:57 (GMT) |
| commit | 4bdeb312083e65fccbb0a4b4043568f60520c67a (patch) | |
| tree | ed123e56179e3c28e37da57942bb3eabc7bebb3a /fs/ocfs2/locks.c | |
| parent | aa569fa0ea32d1c24fb801a07d2d9174cbbdde23 (diff) | |
| parent | 883854c5457a97190f7b0ee20f03bcd9664fc0c2 (diff) | |
| download | linux-4bdeb312083e65fccbb0a4b4043568f60520c67a.tar.xz | |
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
Diffstat (limited to 'fs/ocfs2/locks.c')
0 files changed, 0 insertions, 0 deletions