]> 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)
commite6d5956ba6cd9b7f565910d32cdba499d2ae319c
tree4f31fdf50bfe64616aca1c4e2405930fd5b15e84
parent8d4297059275531f863204c028ab2f94e81a8dbc
parent13312447dd76fb95848e6ba30cf1db1b557d4f34
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