summaryrefslogtreecommitdiff
path: root/fs/ocfs2/dlm/dlmmaster.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2016-05-16 10:13:08 +0300
committerTakashi Iwai <tiwai@suse.de>2016-05-16 10:13:08 +0300
commit581abbaa03367f0b1327521f30bd2b69b8075b2f (patch)
tree686db8cee890fa97061baf5722c3bb9344e658dc /fs/ocfs2/dlm/dlmmaster.c
parent84add303ef950b8d85f54bc2248c2bc73467c329 (diff)
parent639db596165746ca87bbcb56559b094fd9042890 (diff)
downloadlinux-581abbaa03367f0b1327521f30bd2b69b8075b2f.tar.xz
Merge branch 'for-next' into for-linus
Diffstat (limited to 'fs/ocfs2/dlm/dlmmaster.c')
0 files changed, 0 insertions, 0 deletions