]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-2.6.37' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Nov 2010 15:59:41 +0000 (07:59 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Nov 2010 15:59:41 +0000 (07:59 -0800)
commit23bc010eddc65f7eb30173252051d5ea988e8476
tree10c1e1ec16a1874416f9aa18e44a31a6d3087952
parent759e4ad1cb0208e9de0566c5260dc5029f68cbbf
parent73b273dfd134d8714d306f60c4deb2b23a91a5a9
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