diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 16:33:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-26 16:33:14 -0400 |
| commit | da206c9e68cb93fcab43592d46276c02889c1250 (patch) | |
| tree | 21264cc26fa0322d668b398808f10bd93558d25f /fs/9p | |
| parent | 916d15445f4ad2a9018e5451760734f36083be77 (diff) | |
| parent | 2e2d0dcc1bd7ca7c26ea5e29efb7f34bbd564f1c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
typo fixes
Clean up 'inline is not at beginning' warnings for usb storage
Storage class should be first
i386: Trivial typo fixes
ixj: make ixj_set_tone_off() static
spelling fixes
fix paniced->panicked typos
Spelling fixes for Documentation/atomic_ops.txt
move acknowledgment for Mark Adler to CREDITS
remove the bouncing email address of David Campbell
Diffstat (limited to 'fs/9p')
| -rw-r--r-- | fs/9p/mux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/9p/mux.c b/fs/9p/mux.c index f4407eb276c7..12e1baa4508d 100644 --- a/fs/9p/mux.c +++ b/fs/9p/mux.c | |||
| @@ -712,7 +712,7 @@ static void v9fs_read_work(void *a) | |||
| 712 | * v9fs_send_request - send 9P request | 712 | * v9fs_send_request - send 9P request |
| 713 | * The function can sleep until the request is scheduled for sending. | 713 | * The function can sleep until the request is scheduled for sending. |
| 714 | * The function can be interrupted. Return from the function is not | 714 | * The function can be interrupted. Return from the function is not |
| 715 | * a guarantee that the request is sent succesfully. Can return errors | 715 | * a guarantee that the request is sent successfully. Can return errors |
| 716 | * that can be retrieved by PTR_ERR macros. | 716 | * that can be retrieved by PTR_ERR macros. |
| 717 | * | 717 | * |
| 718 | * @m: mux data | 718 | * @m: mux data |