]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-2.6.39' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Apr 2011 22:45:17 +0000 (15:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 11 Apr 2011 22:45:17 +0000 (15:45 -0700)
commitdc710ef0e6f66ec0bccfe6be5a14380e399937d9
tree548e113ab83307d25e41ea1e67ace6f53b194798
parente12af1241f4b6bb62f26704f77f1ed4b3e10638d
parent85854876ee1becb642a134ed35593a6a3d940039
Merge branch 'for-2.6.39' of git://linux-nfs.org/~bfields/linux

* 'for-2.6.39' of git://linux-nfs.org/~bfields/linux:
  nfsd4: fix oops on lock failure
  nfsd: fix auth_domain reference leak on nlm operations
fs/nfsd/nfs4state.c