Merge branch 'skip_delete_inode' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

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

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

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