| commit | 89c122236e60747f920008c9cf4e9cbde3333e50 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 31 20:30:59 2011 +0900 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue May 31 20:30:59 2011 +0900 |
| tree | f43cf6740b16385a37045473127dc96ae26a6120 | |
| parent | 339dedf709e21d5718d6596750166f70e8bed40a [diff] | |
| parent | c7427d23f7ed695ac226dbe3a84d7f19091d34ce [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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