]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0051563 4a1998d)
Merge branch 'for-2.6.40' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 21 Jun 2011 03:10:52 +0000 (20:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 21 Jun 2011 03:10:52 +0000 (20:10 -0700)
commit88eb2d20853c0d70dd29bdcc9bba6a42dd443a67
tree08f6ffd17275e6fab7bd8014d849d2fce46632d9tree | snapshot
parent0051563f166e5920fd65c42db401d95202048c51commit | diff
parent4a1998db69e7aef1dd9c2f7bcf6b55871d8cc019commit | 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
Linux Kernel Source Tree.