From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 8 Sep 2014 22:18:06 +0000 (-0700)
Subject: Merge branch 'for-3.17' of git://linux-nfs.org/~bfields/linux
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=861b7102b58ea55e171e503c2163efd60a4cc052;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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

861b7102b58ea55e171e503c2163efd60a4cc052