projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6e158d2 105f462)
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)
commiteda0841094a3a232357ca10a24b40da461db3fcf
tree08f6ffd17275e6fab7bd8014d849d2fce46632d9tree | snapshot (tar.gz zip)
parent6e158d21986fa15d21fd32cf241d167d4d741ae3commit | diff
parent105f4622104848ff1ee1f644d661bef9dec3eb27commit | 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