diff options
author | Linus Torvalds | 2006-10-04 01:35:11 +0200 |
---|---|---|
committer | Linus Torvalds | 2006-10-04 01:35:11 +0200 |
commit | 708e16892e1646594a29eaa7ac7b209b600b9fd2 (patch) | |
tree | fe7c31bc0edef84eb1075c7e195340047d6aaa17 /Documentation/scsi/aic79xx.txt | |
parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog (diff) | |
parent | Add missing maintainer countries in CREDITS (diff) | |
download | kernel-qcow2-linux-708e16892e1646594a29eaa7ac7b209b600b9fd2.tar.gz kernel-qcow2-linux-708e16892e1646594a29eaa7ac7b209b600b9fd2.tar.xz kernel-qcow2-linux-708e16892e1646594a29eaa7ac7b209b600b9fd2.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (39 commits)
Add missing maintainer countries in CREDITS
Fix bytes <-> kilobytes typo in Kconfig for ramdisk
fix a typo in Documentation/pi-futex.txt
BUG_ON conversion for fs/xfs/
BUG_ON() conversion in fs/nfsd/
BUG_ON conversion for fs/reiserfs
BUG_ON cleanups in arch/i386
BUG_ON cleanup in drivers/net/tokenring/
BUG_ON cleanup for drivers/md/
kerneldoc-typo in led-class.c
debugfs: spelling fix
rcutorture: Fix incorrect description of default for nreaders parameter
parport: Remove space in function calls
Michal Wronski: update contact info
Spelling fix: "control" instead of "cotrol"
reboot parameter in Documentation/kernel-parameters.txt
Fix copy&waste bug in comment in scripts/kernel-doc
remove duplicate "until" from kernel/workqueue.c
ite_gpio fix tabbage
fix file specification in comments
...
Fixed trivial path conflicts due to removed files:
arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c
Diffstat (limited to 'Documentation/scsi/aic79xx.txt')
-rw-r--r-- | Documentation/scsi/aic79xx.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/scsi/aic79xx.txt b/Documentation/scsi/aic79xx.txt index 382b439b439e..904d49e90ef2 100644 --- a/Documentation/scsi/aic79xx.txt +++ b/Documentation/scsi/aic79xx.txt @@ -81,7 +81,7 @@ The following information is available in this file: an SDTR with an offset of 0 to be sure the target knows we are async. This works around a firmware defect in the Quantum Atlas 10K. - - Implement controller susupend and resume. + - Implement controller suspend and resume. - Clear PCI error state during driver attach so that we don't disable memory mapped I/O due to a stray write by some other driver probe that occurred before we @@ -94,7 +94,7 @@ The following information is available in this file: - Add support for scsi_report_device_reset() found in 2.5.X kernels. - Add 7901B support. - - Simplify handling of the packtized lun Rev A workaround. + - Simplify handling of the packetized lun Rev A workaround. - Correct and simplify handling of the ignore wide residue message. The previous code would fail to report a residual if the transaction data length was even and we received |