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)
commitbc83220c210f8056368ce0fd3339adccd1b41d31
tree1056fbdc4d31b3d7aa459bb7f32f2b3be5086b22
parenta7eb063d67c12cef22bf94e6e531ab7bc9b846e7
parent81e1f9c240f4b1a8fad3c404518a9ee0e5e1b9b5
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