diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-22 08:22:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-22 08:22:33 -0700 |
| commit | a7b354e868bc2f887dfb0a418aa7d96df1afc399 (patch) | |
| tree | 7f07d314a3a0177daab9b54d78ded0c4f9e412e0 /Documentation | |
| parent | f7edd5fbde8af44fa06218f56e0f648fc7a527c8 (diff) | |
| parent | 4ef281853474389fea952e9e59650e599ecf2d62 (diff) | |
| download | op-kernel-dev-a7b354e868bc2f887dfb0a418aa7d96df1afc399.zip op-kernel-dev-a7b354e868bc2f887dfb0a418aa7d96df1afc399.tar.gz | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[libata] pata_it821x: fix warning
libata: Fix a large collection of DMA mode mismatches
ahci: sis controllers actually can do PMP
pata_via: clean up recent tf_load changes
libata: restore SControl on detach
libata: use ata_link_printk() when printing SError
libata: always do follow-up SRST if hardreset returned -EAGAIN
libata: fix EH action overwriting in ata_eh_reset()
sata_mv: add the Gen IIE flag to the SoC devices.
ata_piix: IDE Mode SATA patch for Intel Ibex Peak DeviceIDs
ahci: RAID mode SATA patch for Intel Ibex Peak DeviceIDs
sata_mv: don't issue two DMA commands concurrently
libata: implement no[hs]rst force params
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index a897646..1150444 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1074,6 +1074,9 @@ and is between 256 and 4096 characters. It is defined in the file * [no]ncq: Turn on or off NCQ. + * nohrst, nosrst, norst: suppress hard, soft + and both resets. + If there are multiple matching configurations changing the same attribute, the last one is used. |
