From: Linus Torvalds Date: Tue, 31 May 2011 11:30:59 +0000 (+0900) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 X-Git-Tag: v3.0-rc2~28 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=89c122236e60747f920008c9cf4e9cbde3333e50;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git 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 --- 89c122236e60747f920008c9cf4e9cbde3333e50