From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 9 Mar 2011 22:52:09 +0000 (-0800)
Subject: Merge branch 'for-2.6.38' of git://linux-nfs.org/~bfields/linux
X-Git-Tag: v2.6.38~33
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3979491701cfb2aa7477f5baf40553355391418b;p=profile%2Fcommon%2Fkernel-common.git

Merge branch 'for-2.6.38' of git://linux-nfs.org/~bfields/linux

* 'for-2.6.38' of git://linux-nfs.org/~bfields/linux:
  nfsd: wrong index used in inner loop
  nfsd4: fix bad pointer on failure to find delegation
  NFSD: fix decode_cb_sequence4resok
---

3979491701cfb2aa7477f5baf40553355391418b