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)
commitf8e9248dbb2bddfaed86a14254b7ca2409ef68ff
tree1056fbdc4d31b3d7aa459bb7f32f2b3be5086b22
parentfefcdbe4accadc7b9fac67066762d11f0e36d173
parent64a817cfbded8674f345d1117b117f942a351a69
Merge branch 'for-3.9' of git://linux-nfs.org/~bfields/linux

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