commit | 533db9b3d4e1a0405161e66f4da66baf5863b863 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Nov 22 08:41:17 2013 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Nov 22 08:41:17 2013 -0800 |
tree | 3ed4d35f249c5191e79cf02062b3f92cfc5bad36 | |
parent | c85e07278e50bdfbb50fe038d9cca01cdf1074d1 [diff] | |
parent | 365da4adebb1c012febf81019ad3dc5bb52e2a13 [diff] |
Merge branch 'for-3.13' of git://linux-nfs.org/~bfields/linux Pull nfsd bugfixes from Bruce Fields: "A couple nfsd bugfixes" * 'for-3.13' of git://linux-nfs.org/~bfields/linux: nfsd4: fix xdr decoding of large non-write compounds nfsd: make sure to balance get/put_write_access nfsd: split up nfsd_setattr