]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'dlm-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Jun 2014 14:41:57 +0000 (07:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Jun 2014 14:41:57 +0000 (07:41 -0700)
commit35f70d6c03265783e66872f7e9f7672e9d45e7a1
treeed123e56179e3c28e37da57942bb3eabc7bebb3a
parent5d7955cde9f72e0732fdbedaa47c6c65bc8ad28a
parent9cac49199244da76a6efc182a834786a73a84bac
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