Merge branch 'for-3.17' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <[email protected]>
Mon, 8 Sep 2014 22:18:06 +0000 (15:18 -0700)
committerLinus Torvalds <[email protected]>
Mon, 8 Sep 2014 22:18:06 +0000 (15:18 -0700)
Pull nfsd bugfixes from Bruce Fields:
 "A couple minor nfsd bugfixes"

* 'for-3.17' of git://linux-nfs.org/~bfields/linux:
  lockd: fix rpcbind crash on lockd startup failure
  nfsd4: fix rd_dircount enforcement


Trivial merge