Merge branch 'skip_delete_inode' of git://git.kernel.org/pub/scm/linux/kernel/git...
Joel Becker [Fri, 30 Apr 2010 20:37:29 +0000 (13:37 -0700)]
1  2 
fs/ocfs2/buffer_head_io.c
fs/ocfs2/dlm/dlmast.c
fs/ocfs2/inode.c
fs/ocfs2/refcounttree.c

Simple merge
Simple merge
Simple merge
Simple merge