diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-23 17:55:11 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-23 17:55:11 -0700 |
commit | 82e13c71bc655b6dc7110da4e164079dadb44892 (patch) | |
tree | 22e19b621081f9d4d26f3a9451eeb0bb85f1e43d /arch/parisc | |
parent | 98de5ab7138bdb78ba1cf50978201a4c21bdb111 (diff) | |
parent | f98bac5a30b60a2fca854dd5ee7256221d8ccf0a (diff) | |
download | blackbird-op-linux-82e13c71bc655b6dc7110da4e164079dadb44892.tar.gz blackbird-op-linux-82e13c71bc655b6dc7110da4e164079dadb44892.zip |
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
Diffstat (limited to 'arch/parisc')
0 files changed, 0 insertions, 0 deletions