Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Oct 2013 17:16:47 +0000 (18:16 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Oct 2013 17:16:47 +0000 (18:16 +0100)
Pull vfs fixes (try two) from Al Viro:
 "nfsd performance regression fix + seq_file lseek(2) fix"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  seq_file: always update file->f_pos in seq_lseek()
  nfsd regression since delayed fput()


Trivial merge