Merge tag 'dlm-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Dec 2014 00:02:12 +0000 (16:02 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Dec 2014 00:02:12 +0000 (16:02 -0800)
commit8322b6fddfd2cee41a7732284e5f04750511f4b2
treeebff5f6c0d43aa82c7e36cfb5cfd40be050db8a2
parent1366f5d3129f2abde606214de7afc3dd61781fa3
parent2ab4bd8ea3a6954bc79a9bbeb291cd6c2d6213a7
Merge tag 'dlm-3.19' of git://git./linux/kernel/git/teigland/linux-dlm

Pull dlm update from David Teigland:
 "This set includes one feature, which allows locks that have been
  orphaned to be reacquired"

* tag 'dlm-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
  dlm: adopt orphan locks