Merge branch 'mlog_replace_for_39' of git://repo.or.cz/taoma-kernel into ocfs2-merge...
Joel Becker [Mon, 28 Mar 2011 16:44:26 +0000 (09:44 -0700)]
1  2 
fs/ocfs2/dir.c
fs/ocfs2/dlm/dlmdomain.c
fs/ocfs2/dlmglue.c
fs/ocfs2/ioctl.c

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