From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 11 Apr 2011 22:45:17 +0000 (-0700)
Subject: Merge branch 'for-2.6.39' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v2.6.39-rc3~3
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=18770c7c3a0ccd60017ac76b5d2e7d1f71376b94;p=linux.git

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
---

18770c7c3a0ccd60017ac76b5d2e7d1f71376b94