| commit | 0f90933c477c061df6daf42d814ff2012aea43cc | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Nov 12 07:59:41 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Nov 12 07:59:41 2010 -0800 |
| tree | 10c1e1ec16a1874416f9aa18e44a31a6d3087952 | |
| parent | e2b348354112df63a9c2ea4219a6867c6c7ea100 [diff] | |
| parent | 8896b93f42459b18b145c69d399b62870df48061 [diff] |
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