| commit | eda0841094a3a232357ca10a24b40da461db3fcf | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 20 20:10:52 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 20 20:10:52 2011 -0700 |
| tree | 08f6ffd17275e6fab7bd8014d849d2fce46632d9 | |
| parent | 6e158d21986fa15d21fd32cf241d167d4d741ae3 [diff] | |
| parent | 105f4622104848ff1ee1f644d661bef9dec3eb27 [diff] |
Merge branch 'for-2.6.40' of git://linux-nfs.org/~bfields/linux * 'for-2.6.40' of git://linux-nfs.org/~bfields/linux: nfsd4: fix break_lease flags on nfsd open nfsd: link returns nfserr_delay when breaking lease nfsd: v4 support requires CRYPTO nfsd: fix dependency of nfsd on auth_rpcgss