diff options
author | James Bottomley <JBottomley@Parallels.com> | 2012-10-02 08:55:12 +0100 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2012-10-02 08:55:12 +0100 |
commit | fe709ed827d370e6b0c0a9f9456da1c22bdcd118 (patch) | |
tree | c5a7fd72a745a5f6656a58acc9a1d277e26f9595 /Documentation/kernel-parameters.txt | |
parent | 1c4cf1d5845b59cdcbfad8e67272cf5b219ab062 (diff) | |
parent | 0644f5393e915f13733bcc65f13195ff39aeb63e (diff) | |
download | linux-3.10-fe709ed827d370e6b0c0a9f9456da1c22bdcd118.tar.gz linux-3.10-fe709ed827d370e6b0c0a9f9456da1c22bdcd118.tar.bz2 linux-3.10-fe709ed827d370e6b0c0a9f9456da1c22bdcd118.zip |
Merge SCSI misc branch into isci-for-3.6 tag
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-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 ad7e2e5088c..2cb2d81a51a 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1350,6 +1350,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted. * nohrst, nosrst, norst: suppress hard, soft and both resets. + * rstonce: only attempt one reset during + hot-unplug link recovery + * dump_id: dump IDENTIFY data. If there are multiple matching configurations changing |