summaryrefslogtreecommitdiffstats
path: root/fs/notify
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-12-10 16:02:12 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-10 16:02:12 -0800
commit8322b6fddfd2cee41a7732284e5f04750511f4b2 (patch)
treeebff5f6c0d43aa82c7e36cfb5cfd40be050db8a2 /fs/notify
parent1366f5d3129f2abde606214de7afc3dd61781fa3 (diff)
parent2ab4bd8ea3a6954bc79a9bbeb291cd6c2d6213a7 (diff)
downloadlinux-8322b6fddfd2cee41a7732284e5f04750511f4b2.tar.bz2
Merge tag 'dlm-3.19' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'fs/notify')
0 files changed, 0 insertions, 0 deletions