Merge branch 'mlog_replace_for_39' of git://repo.or.cz/taoma-kernel into ocfs2-merge...

diff --cc fs/ocfs2/dir.c
Simple merge

diff --cc fs/ocfs2/dlm/dlmdomain.c
Simple merge

diff --cc fs/ocfs2/dlmglue.c
Simple merge

diff --cc fs/ocfs2/ioctl.c
Simple merge