diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 23:36:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 23:36:17 -0400 |
commit | c00046c279a2521075250fad682ca0acc10d4fd7 (patch) | |
tree | 78a7e9089c26f199ad9b0161bb564b7c1ca6daf9 /Documentation/scsi/arcmsr_spec.txt | |
parent | 9abbf7d028b1598b40ebdc81c48f30da7f3d5bf5 (diff) | |
parent | 8e8a1407ac23b43cec0412338c1b4f5e1c664550 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (74 commits)
fix do_sys_open() prototype
sysfs: trivial: fix sysfs_create_file kerneldoc spelling mistake
Documentation: Fix typo in SubmitChecklist.
Typo: depricated -> deprecated
Add missing profile=kvm option to Documentation/kernel-parameters.txt
fix typo about TBI in e1000 comment
proc.txt: Add /proc/stat field
small documentation fixes
Fix compiler warning in smount example program from sharedsubtree.txt
docs/sysfs: add missing word to sysfs attribute explanation
documentation/ext3: grammar fixes
Documentation/java.txt: typo and grammar fixes
Documentation/filesystems/vfs.txt: typo fix
include/asm-*/system.h: remove unused set_rmb(), set_wmb() macros
trivial copy_data_pages() tidy up
Fix typo in arch/x86/kernel/tsc_32.c
file link fix for Pegasus USB net driver help
remove unused return within void return function
Typo fixes retrun -> return
x86 hpet.h: remove broken links
...
Diffstat (limited to 'Documentation/scsi/arcmsr_spec.txt')
-rw-r--r-- | Documentation/scsi/arcmsr_spec.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/scsi/arcmsr_spec.txt b/Documentation/scsi/arcmsr_spec.txt index 5e0042340fd3..45d9482c1517 100644 --- a/Documentation/scsi/arcmsr_spec.txt +++ b/Documentation/scsi/arcmsr_spec.txt | |||
@@ -3,7 +3,7 @@ | |||
3 | ******************************************************************************* | 3 | ******************************************************************************* |
4 | ** Usage of IOP331 adapter | 4 | ** Usage of IOP331 adapter |
5 | ** (All In/Out is in IOP331's view) | 5 | ** (All In/Out is in IOP331's view) |
6 | ** 1. Message 0 --> InitThread message and retrun code | 6 | ** 1. Message 0 --> InitThread message and return code |
7 | ** 2. Doorbell is used for RS-232 emulation | 7 | ** 2. Doorbell is used for RS-232 emulation |
8 | ** inDoorBell : bit0 -- data in ready | 8 | ** inDoorBell : bit0 -- data in ready |
9 | ** (DRIVER DATA WRITE OK) | 9 | ** (DRIVER DATA WRITE OK) |