]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-3.10' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 10 May 2013 16:28:55 +0000 (09:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 10 May 2013 16:28:55 +0000 (09:28 -0700)
commit11cd7e5e5c3b2ee041541a1a6a5ac5f7662d000a
tree4f31fdf50bfe64616aca1c4e2405930fd5b15e84
parenta85c3a501b5c848f549a4a0e6c4a65b9d18318fd
parent07c7bf2aa8cbff9bb90278d9d15cc2ee0af00d29
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