Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Sep 2013 18:11:28 +0000 (11:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 30 Sep 2013 18:11:28 +0000 (11:11 -0700)
commitcbb16bec2d5bc5423f720e6aaed152de9be234ec
tree0bd3a793cef2d1e5da2ab6dc4053d0087a7f1964
parent5c282e858f87651e97b31b99e7446aeb449f987e
parent13f3583892cb7afdb2e9eb0207dc4e03ec6f01fd
Merge branch 'for-linus' of git://git./linux/kernel/git/viro/vfs

Pull assorted vfs fixes from Al Viro:
 "A couple of bug fixes + removal of dead code in afs ->d_revalidate()"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  afs: dget_parent() can't return a negative dentry
  ocfs2: needs ->d_lock to poke in ->d_parent->d_inode from ->d_revalidate()
  sysv: Add forgotten superblock lock init for v7 fs