From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 21 Jun 2011 03:10:52 +0000 (-0700)
Subject: Merge branch 'for-2.6.40' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v3.0-rc4~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eda0841094a3a232357ca10a24b40da461db3fcf;p=profile%2Fivi%2Fkernel-x86-ivi.git

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
---

eda0841094a3a232357ca10a24b40da461db3fcf