| commit | 3f6f7e6d57b8a0ae2810ae7aac70c51b6f2a6304 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 18 10:50:52 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 18 10:50:52 2011 -0700 |
| tree | ed4460a8f072cd088e225163bdeeafc5ce9fecb6 | |
| parent | 8f627a8a881481598c2591c3acc122fb9be7bac4 [diff] | |
| parent | 31be83aeaee22fa165862ad449c7131ceaf1cf91 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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