From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 22 Nov 2013 16:41:17 +0000 (-0800)
Subject: Merge branch 'for-3.13' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v3.13-rc1~11
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=533db9b3d4e1a0405161e66f4da66baf5863b863;p=~emulex%2Finfiniband.git

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
---

533db9b3d4e1a0405161e66f4da66baf5863b863