Merge branch 'for-3.17' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Sep 2014 22:18:06 +0000 (15:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Sep 2014 22:18:06 +0000 (15:18 -0700)
commit861b7102b58ea55e171e503c2163efd60a4cc052
treee6e22375644c929057206e8e1e28b512ffcdeb74
parent35af25616c6c0c42416545f732d36b2ba7199519
parent7c17705e77b12b20fb8afb7c1b15dcdb126c0c12
Merge branch 'for-3.17' of git://linux-nfs.org/~bfields/linux

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