projects
/
GitHub
/
LineageOS
/
android_kernel_samsung_universal7580.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
compact
(merge:
6e158d2
105f462
)
Merge branch 'for-2.6.40' of git://linux-nfs.org/~bfields/linux
author
Linus Torvalds
<torvalds@linux-foundation.org>
Tue, 21 Jun 2011 03:10:52 +0000
(20:10 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Tue, 21 Jun 2011 03:10:52 +0000
(20:10 -0700)
* '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
Trivial merge