diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-17 06:53:41 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-17 06:53:41 +0100 |
commit | ee715087024b91a6ceb85ba2d02f6c35d354a48c (patch) | |
tree | 9f6bdcd5932d35eb9f15ae3dd647c6f5063873a4 /scripts/pnmtologo.c | |
parent | Merge branch 'spi/merge' of git://git.secretlab.ca/git/linux-2.6 (diff) | |
parent | nfsd: correctly handle return value from nfsd_map_name_to_* (diff) | |
download | linux-ee715087024b91a6ceb85ba2d02f6c35d354a48c.tar.xz linux-ee715087024b91a6ceb85ba2d02f6c35d354a48c.zip |
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_*
Diffstat (limited to 'scripts/pnmtologo.c')
0 files changed, 0 insertions, 0 deletions