From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 24 Jul 2014 00:55:11 +0000 (-0700)
Subject: Merge branch 'for-3.16' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: firefly_0821_release~176^2~3560
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=82e13c71bc655b6dc7110da4e164079dadb44892;p=firefly-linux-kernel-4.4.55.git

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

Pull nfsd bugfix from Bruce Fields:
 "Another regression from the xdr encoding rewrite"

* 'for-3.16' of git://linux-nfs.org/~bfields/linux:
  NFSD: Fix crash encoding lock reply on 32-bit
---

82e13c71bc655b6dc7110da4e164079dadb44892