Merge branch 'for-3.16' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Jul 2014 00:55:11 +0000 (17:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Jul 2014 00:55:11 +0000 (17:55 -0700)
commit82e13c71bc655b6dc7110da4e164079dadb44892
tree22e19b621081f9d4d26f3a9451eeb0bb85f1e43d
parent98de5ab7138bdb78ba1cf50978201a4c21bdb111
parentf98bac5a30b60a2fca854dd5ee7256221d8ccf0a
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