diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-21 17:42:55 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-21 17:42:55 -0800 |
commit | ff0bc6cc7f20cfaf9aed4055773158f3f295b28b (patch) | |
tree | ba968e3dc1fbdb730941fca5842b988fccba368c /fs/utimes.c | |
parent | 2182c815f3d430598e172c1c3ac88df775ea120e (diff) | |
parent | ece35848c1847cdf3dd07954578d3e99238ebbae (diff) | |
download | linux-ff0bc6cc7f20cfaf9aed4055773158f3f295b28b.tar.bz2 |
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
Diffstat (limited to 'fs/utimes.c')
0 files changed, 0 insertions, 0 deletions