Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 1 Dec 2012 21:29:55 +0000 (13:29 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 1 Dec 2012 21:29:55 +0000 (13:29 -0800)
commit331fee3cd31c3ec3641062ca01a71b79dbf58b40
tree90fa1a59b0256c82f95853f60b5e551431a1eb43
parentb3c3a9cf2a28ee4a8d0b62e2e58c61e9ca9bb47b
parenta77cfcb429ed98845a4e4df72473b8f37acd890b
Merge branch 'for-linus' of git://git./linux/kernel/git/viro/vfs

Pull vfs fixes from Al Viro:
 "A bunch of fixes; the last one is this cycle regression, the rest are
  -stable fodder."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fix off-by-one in argument passed by iterate_fd() to callbacks
  lookup_one_len: don't accept . and ..
  cifs: get rid of blind d_drop() in readdir
  nfs_lookup_revalidate(): fix a leak
  don't do blind d_drop() in nfs_prime_dcache()