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)
commitf55ac56d5ee8ef00aea9fa716625caa6ae8e9674
tree0df9b375616ce4a0279d597f8cbe167c966f0861
parent4208c471995f90479cd129b15cd459b4a7eaebb3
parent05e16745c0c471bba313961b605b6da3b21a853d
Merge branch 'for-linus' of git://git./linux/kernel/git/viro/vfs

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()