Skip to content
Commit 18770c7c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 6b98cd5a 23fcf2ec
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment