diff options
author | 2010-11-12 07:59:41 -0800 | |
---|---|---|
committer | 2010-11-12 07:59:41 -0800 | |
commit | 0f90933c477c061df6daf42d814ff2012aea43cc (patch) | |
tree | 10c1e1ec16a1874416f9aa18e44a31a6d3087952 /kernel | |
parent | crypto: pcrypt - Fix use after free on padata_free (diff) | |
parent | locks: remove dead lease error-handling code (diff) | |
download | linux-dev-0f90933c477c061df6daf42d814ff2012aea43cc.tar.xz linux-dev-0f90933c477c061df6daf42d814ff2012aea43cc.zip |
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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions