From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 12 Nov 2010 15:59:41 +0000 (-0800)
Subject: Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux
X-Git-Url: https://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=0f90933c477c061df6daf42d814ff2012aea43cc

Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux

* 'for-2.6.37' of git://linux-nfs.org/~bfields/linux:
  locks: remove dead lease error-handling code
  locks: fix leak on merging leases
  nfsd4: fix 4.1 connection registration race
---

0f90933c477c061df6daf42d814ff2012aea43cc