summaryrefslogtreecommitdiff
path: root/fs/ocfs2/dlm/dlmmaster.c
diff options
context:
space:
mode:
authorDave Chinner <david@fromorbit.com>2015-09-01 03:30:11 +0300
committerDave Chinner <david@fromorbit.com>2015-09-01 03:30:11 +0300
commit5d54b8cdeaf4679c51a510dea3f8921992d0b064 (patch)
tree62852f195efbd0e5c2bb222d6b74896de4ceac57 /fs/ocfs2/dlm/dlmmaster.c
parent70b33a7466baac62103e04c916b8915665b79d80 (diff)
parent1a7ccad88d1bcebabc011b54a2f8615175e523fc (diff)
downloadlinux-5d54b8cdeaf4679c51a510dea3f8921992d0b064.tar.xz
Merge branch 'xfs-misc-fixes-for-4.3-4' into for-next
Diffstat (limited to 'fs/ocfs2/dlm/dlmmaster.c')
0 files changed, 0 insertions, 0 deletions