tree a8ec83a791066e64ad02052498dbe39ebefacab9
parent f1f8935a5c38a2c61e86a42bc971a2539eef2211
parent f0023bc617ba600956b9226f1806033d7486c8ba
author Linus Torvalds <torvalds@linux-foundation.org> 1320259261 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1320259261 -0700

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs-queue

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs-queue:
  vfs: add d_prune dentry operation
  vfs: protect i_nlink
  filesystems: add set_nlink()
  filesystems: add missing nlink wrappers
  logfs: remove unnecessary nlink setting
  ocfs2: remove unnecessary nlink setting
  jfs: remove unnecessary nlink setting
  hypfs: remove unnecessary nlink setting
  vfs: ignore error on forced remount
  readlinkat: ensure we return ENOENT for the empty pathname for normal lookups
  vfs: fix dentry leak in simple_fill_super()