Merge tag 'dlm-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Nov 2015 19:15:25 +0000 (11:15 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Nov 2015 19:15:25 +0000 (11:15 -0800)
commitd000f8d67f2bb464c9cf4fb5103f78d8cb406c05
treeee34c7a8a621389136a75f74ceddcf28104a7332
parent9576c2f2934eb5839a468ae156418ef595d5fec6
parenta6b1533e9a57d76cd3d9b7649d29ac604b1874b8
Merge tag 'dlm-4.4' of git://git./linux/kernel/git/teigland/linux-dlm

Pull dlm update from David Teigland:
 "This includes one simple fix to make posix locks interruptible by
  signals in cases where a signal handler is used"

* tag 'dlm-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  dlm: make posix locks interruptible
fs/dlm/plock.c