diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-13 01:39:22 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-13 01:39:22 +0200 |
| commit | b0e0c9e7f6d5764633e93944dafd896dd6097318 (patch) | |
| tree | 668d9adb29cb566f6240e7bc51faaf564d3241ca /fs/nls/nls_cp949.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol... (diff) | |
| parent | fs/nfsd/export.c: Adjust error handling code involving auth_domain_put (diff) | |
| download | linux-b0e0c9e7f6d5764633e93944dafd896dd6097318.tar.xz linux-b0e0c9e7f6d5764633e93944dafd896dd6097318.zip | |
Merge branch 'for-2.6.27' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.27' of git://linux-nfs.org/~bfields/linux:
fs/nfsd/export.c: Adjust error handling code involving auth_domain_put
MAINTAINERS: mention lockd and sunrpc in nfs entries
lockd: trivial sparse endian annotations
Diffstat (limited to 'fs/nls/nls_cp949.c')
0 files changed, 0 insertions, 0 deletions