From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 25 Mar 2014 22:24:11 +0000 (-0700)
Subject: Merge branch 'nfsd-next' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: MMI-PSA29.97-13-9~12564
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=632b06aa2842b12c6d6a510ec080fb6ebdb38ea5;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'nfsd-next' of git://linux-nfs.org/~bfields/linux

Pull nfsd fix frm Bruce Fields:
 "J R Okajima sent this early and I was just slow to pass it along,
  apologies.  Fortunately it's a simple fix"

* 'nfsd-next' of git://linux-nfs.org/~bfields/linux:
  nfsd: fix lost nfserrno() call in nfsd_setattr()
---

632b06aa2842b12c6d6a510ec080fb6ebdb38ea5