git.openpandora.org / pandora-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: aa569fa 883854c)
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)
commit4bdeb312083e65fccbb0a4b4043568f60520c67a
treeed123e56179e3c28e37da57942bb3eabc7bebb3atree | snapshot
parentaa569fa0ea32d1c24fb801a07d2d9174cbbdde23commit | diff
parent883854c5457a97190f7b0ee20f03bcd9664fc0c2commit | diff
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
Pandora Kernel Repository