Merge branch 'for-2.6.38' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Feb 2011 05:53:41 +0000 (21:53 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Feb 2011 05:53:41 +0000 (21:53 -0800)
commitee715087024b91a6ceb85ba2d02f6c35d354a48c
tree9f6bdcd5932d35eb9f15ae3dd647c6f5063873a4
parent68ac01a2de5faed5e19a78c06314804c6184a650
parent47c85291d3dd1a51501555000b90f8e281a0458e
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_*