Merge branch 'skip_delete_inode' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorJoel Becker <joel.becker@oracle.com>
Fri, 30 Apr 2010 20:37:29 +0000 (13:37 -0700)
committerJoel Becker <joel.becker@oracle.com>
Fri, 30 Apr 2010 20:37:29 +0000 (13:37 -0700)

Trivial merge