summaryrefslogtreecommitdiff
path: root/fs/dlm/lock.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-05-16 05:02:40 (GMT)
committerDavid S. Miller <davem@davemloft.net>2012-05-16 05:02:40 (GMT)
commitc727e7f0071cae66c029f667d48b154c6b64227b (patch)
tree197c2760fcae529d04d56f56e9cd55f51d6d9273 /fs/dlm/lock.h
parent91df42bedccb919902c7cf7eb876c982ae7f1b1d (diff)
parentee446fd5e6dafee4a16fd1bd345d2571dcfd6f5d (diff)
downloadlinux-fsl-qoriq-c727e7f0071cae66c029f667d48b154c6b64227b.tar.xz
Merge branch 'delete-tokenring' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
Diffstat (limited to 'fs/dlm/lock.h')
0 files changed, 0 insertions, 0 deletions