diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 18:50:52 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-18 18:50:52 +0100 |
| commit | 3f6f7e6d57b8a0ae2810ae7aac70c51b6f2a6304 (patch) | |
| tree | ed4460a8f072cd088e225163bdeeafc5ce9fecb6 /fs/dcache.c | |
| parent | Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6 (diff) | |
| parent | omfs: make readdir stop when filldir says so (diff) | |
| download | linux-3f6f7e6d57b8a0ae2810ae7aac70c51b6f2a6304.tar.xz linux-3f6f7e6d57b8a0ae2810ae7aac70c51b6f2a6304.zip | |
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
Diffstat (limited to 'fs/dcache.c')
0 files changed, 0 insertions, 0 deletions