]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'for-3.9' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Apr 2013 14:56:20 +0000 (07:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Apr 2013 14:56:20 +0000 (07:56 -0700)
Pull nfsd bugfix from J Bruce Fields:
 "An xdr decoding error--thanks, Toralf Förster, and Trinity!"

* 'for-3.9' of git://linux-nfs.org/~bfields/linux:
  nfsd4: reject "negative" acl lengths


Trivial merge