tree 4f31fdf50bfe64616aca1c4e2405930fd5b15e84
parent a77c005887a6d6f318117176791efa0ef7fcca80
parent 7255e716b1757dc10fa5e3a4d2eaab303ff9f7b6
author Linus Torvalds <torvalds@linux-foundation.org> 1368203335 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1368203335 -0700

Merge branch 'for-3.10' of git://linux-nfs.org/~bfields/linux

Pull nfsd fixes from Bruce Fields:
 "Small fixes for two bugs and two warnings"

* 'for-3.10' of git://linux-nfs.org/~bfields/linux:
  nfsd: fix oops when legacy_recdir_name_error is passed a -ENOENT error
  SUNRPC: fix decoding of optional gss-proxy xdr fields
  SUNRPC: Refactor gssx_dec_option_array() to kill uninitialized warning
  nfsd4: don't allow owner override on 4.1 CLAIM_FH opens