diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-27 21:34:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-27 21:34:58 -0400 |
| commit | aa36c7bf987dfa5597c0f7c46f8fca46b2dd33d2 (patch) | |
| tree | ad9fe2294b45562b434bf7cf9e387624057bbd65 /Documentation | |
| parent | 9dda696f0de87a2e5cfabb147e28c76b7d3c6846 (diff) | |
| parent | 43c9c59185eec7caaff6e9dd8d4c93a4d9836a86 (diff) | |
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: implement dump_id force param
libata: disable ATAPI AN by default
libata-sff: make BMDMA optional
libata-sff: kill dummy BMDMA ops from sata_qstor and pata_octeon_cf
libata-sff: separate out BMDMA init
libata-sff: separate out BMDMA irq handler
libata-sff: ata_sff_irq_clear() is BMDMA specific
sata_mv: drop unncessary EH callback resetting
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index b56ea860da21..a5c055066764 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -1252,6 +1252,8 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 1252 | * nohrst, nosrst, norst: suppress hard, soft | 1252 | * nohrst, nosrst, norst: suppress hard, soft |
| 1253 | and both resets. | 1253 | and both resets. |
| 1254 | 1254 | ||
| 1255 | * dump_id: dump IDENTIFY data. | ||
| 1256 | |||
| 1255 | If there are multiple matching configurations changing | 1257 | If there are multiple matching configurations changing |
| 1256 | the same attribute, the last one is used. | 1258 | the same attribute, the last one is used. |
| 1257 | 1259 | ||