diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-20 09:20:59 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-20 09:20:59 -0700 |
commit | f39d01be4c59a61a08d0cb53f615e7016b85d339 (patch) | |
tree | 6777590e3ff2ddf4df1d38444ba7d692cd463b7b /Documentation/scsi/ncr53c8xx.txt | |
parent | 54291263519ac2c9bdda68b23b02fef3808deed4 (diff) | |
parent | 7db82437cfcac4bdfe79a6323eb554fdfa271623 (diff) | |
download | op-kernel-dev-f39d01be4c59a61a08d0cb53f615e7016b85d339.zip op-kernel-dev-f39d01be4c59a61a08d0cb53f615e7016b85d339.tar.gz |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (44 commits)
vlynq: make whole Kconfig-menu dependant on architecture
add descriptive comment for TIF_MEMDIE task flag declaration.
EEPROM: max6875: Header file cleanup
EEPROM: 93cx6: Header file cleanup
EEPROM: Header file cleanup
agp: use NULL instead of 0 when pointer is needed
rtc-v3020: make bitfield unsigned
PCI: make bitfield unsigned
jbd2: use NULL instead of 0 when pointer is needed
cciss: fix shadows sparse warning
doc: inode uses a mutex instead of a semaphore.
uml: i386: Avoid redefinition of NR_syscalls
fix "seperate" typos in comments
cocbalt_lcdfb: correct sections
doc: Change urls for sparse
Powerpc: wii: Fix typo in comment
i2o: cleanup some exit paths
Documentation/: it's -> its where appropriate
UML: Fix compiler warning due to missing task_struct declaration
UML: add kernel.h include to signal.c
...
Diffstat (limited to 'Documentation/scsi/ncr53c8xx.txt')
-rw-r--r-- | Documentation/scsi/ncr53c8xx.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/scsi/ncr53c8xx.txt b/Documentation/scsi/ncr53c8xx.txt index 08e2b4d..cda5f8f 100644 --- a/Documentation/scsi/ncr53c8xx.txt +++ b/Documentation/scsi/ncr53c8xx.txt @@ -1479,7 +1479,7 @@ Wide16 SCSI. Enabling serial NVRAM support enables detection of the serial NVRAM included on Symbios and some Symbios compatible host adaptors, and Tekram boards. The serial NVRAM is used by Symbios and Tekram to hold set up parameters for the -host adaptor and it's attached drives. +host adaptor and its attached drives. The Symbios NVRAM also holds data on the boot order of host adaptors in a system with more than one host adaptor. This enables the order of scanning |