projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6b98cd5 23fcf2e)
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)
* '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

1  2 
fs/nfsd/nfs4state.c patch | diff1 | diff2 | blob | history

diff --cc fs/nfsd/nfs4state.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.