| commit | 82e13c71bc655b6dc7110da4e164079dadb44892 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jul 23 17:55:11 2014 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jul 23 17:55:11 2014 -0700 |
| tree | 22e19b621081f9d4d26f3a9451eeb0bb85f1e43d | |
| parent | 98de5ab7138bdb78ba1cf50978201a4c21bdb111 [diff] | |
| parent | f98bac5a30b60a2fca854dd5ee7256221d8ccf0a [diff] |
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