From: Linus Torvalds Date: Fri, 18 Mar 2011 17:50:52 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bcopeland... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3f6f7e6d57b8a0ae2810ae7aac70c51b6f2a6304;p=linux.git Merge branch 'for-linus' of git://git./linux/kernel/git/bcopeland/omfs * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bcopeland/omfs: omfs: make readdir stop when filldir says so omfs: merge unlink() and rmdir(), close leak in rename() omfs: stop playing silly buggers with omfs_unlink() in ->rename() omfs: rename() needs to mark old_inode dirty after ctime update --- 3f6f7e6d57b8a0ae2810ae7aac70c51b6f2a6304