| commit | ee715087024b91a6ceb85ba2d02f6c35d354a48c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Feb 16 21:53:41 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Feb 16 21:53:41 2011 -0800 |
| tree | 9f6bdcd5932d35eb9f15ae3dd647c6f5063873a4 | |
| parent | 68ac01a2de5faed5e19a78c06314804c6184a650 [diff] | |
| parent | 47c85291d3dd1a51501555000b90f8e281a0458e [diff] |
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_*