tree 9f6bdcd5932d35eb9f15ae3dd647c6f5063873a4
parent 68ac01a2de5faed5e19a78c06314804c6184a650
parent 47c85291d3dd1a51501555000b90f8e281a0458e
author Linus Torvalds <torvalds@linux-foundation.org> 1297922021 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1297922021 -0800

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