From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 22 Jun 2014 00:20:38 +0000 (-1000)
Subject: Merge branch 'for-3.16' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: firefly_0821_release~176^2~3714
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=147f1404db3ed0c3019002eef693c5d297b8f161;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-3.16' of git://linux-nfs.org/~bfields/linux

Pull nfsd bugfixes from Bruce Fields:
 "Fixes for a new regression from the xdr encoding rewrite, and a
  delegation problem we've had for a while (made somewhat more annoying
  by the vfs delegation support added in 3.13)"

* 'for-3.16' of git://linux-nfs.org/~bfields/linux:
  NFSD: fix bug for readdir of pseudofs
  NFSD: Don't hand out delegations for 30 seconds after recalling them.
---

147f1404db3ed0c3019002eef693c5d297b8f161