From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 10 May 2013 16:28:55 +0000 (-0700)
Subject: Merge branch 'for-3.10' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v3.12-rc1~814
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2dbd3cac87250a0d44e07acc86c4224a08522709;p=kernel%2Fkernel-generic.git

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

2dbd3cac87250a0d44e07acc86c4224a08522709