Merge branch 'for-3.13' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Nov 2013 16:41:17 +0000 (08:41 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Nov 2013 16:41:17 +0000 (08:41 -0800)
commit533db9b3d4e1a0405161e66f4da66baf5863b863
tree3ed4d35f249c5191e79cf02062b3f92cfc5bad36
parentc85e07278e50bdfbb50fe038d9cca01cdf1074d1
parent365da4adebb1c012febf81019ad3dc5bb52e2a13
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