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)
commit18770c7c3a0ccd60017ac76b5d2e7d1f71376b94
tree548e113ab83307d25e41ea1e67ace6f53b194798
parent6b98cd5aad3bb51a3b5b51ba670ab8d5fe1cc487
parent23fcf2ec93fb8573a653408316af599939ff9a8e
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