| commit | 89c122236e60747f920008c9cf4e9cbde3333e50 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 31 May 2011 11:30:59 +0000 (31 20:30 +0900) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 31 May 2011 11:30:59 +0000 (31 20:30 +0900) | ||
| tree | f43cf6740b16385a37045473127dc96ae26a6120 | treesnapshot (tar.gz zip) |
| parent | 339dedf709e21d5718d6596750166f70e8bed40a | commitdiff |
| parent | c7427d23f7ed695ac226dbe3a84d7f19091d34ce | commitdiff |
Merge branch 'for-linus' of git://git./linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
autofs4: bogus dentry_unhash() added in ->unlink()
vfs: shrink_dcache_parent before rmdir, dir rename
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
autofs4: bogus dentry_unhash() added in ->unlink()
vfs: shrink_dcache_parent before rmdir, dir rename