From: Linus Torvalds 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-Url: https://git.karo-electronics.de/?p=mv-sheeva.git;a=commitdiff_plain;h=3979491701cfb2aa7477f5baf40553355391418b 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