]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 98de5ab f98bac5)
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)
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


Trivial merge
local clone of linux.git