Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 31 May 2011 11:30:59 +0000 (20:30 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 31 May 2011 11:30:59 +0000 (20:30 +0900)
* '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


Trivial merge