From: Linus Torvalds Date: Thu, 17 Feb 2011 05:53:41 +0000 (-0800) Subject: Merge branch 'for-2.6.38' of git://linux-nfs.org/~bfields/linux X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ee715087024b91a6ceb85ba2d02f6c35d354a48c;p=linux-beck.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: correctly handle return value from nfsd_map_name_to_* --- ee715087024b91a6ceb85ba2d02f6c35d354a48c