tree f43cf6740b16385a37045473127dc96ae26a6120
parent 339dedf709e21d5718d6596750166f70e8bed40a
parent c7427d23f7ed695ac226dbe3a84d7f19091d34ce
author Linus Torvalds <torvalds@linux-foundation.org> 1306841459 +0900
committer Linus Torvalds <torvalds@linux-foundation.org> 1306841459 +0900

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