diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-01-12 11:56:29 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-01-12 11:56:29 -0500 |
| commit | da4540757d35a98a350d6e8d882a64b2d04f8581 (patch) | |
| tree | ad77d8752f5db40497c819f051cbae12effb8163 /Documentation/kernel-parameters.txt | |
| parent | cc131eef1cec905b9bdb0be6d7ab3af86f23de98 (diff) | |
| parent | 7e22e91102c6b9df7c4ae2168910e19d2bb14cd6 (diff) | |
Merge tag 'v3.13-rc8' into x86/ras, to pick up fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -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 453092c822f1..1e1e0b77aec0 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -1537,6 +1537,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. | |||
| 1537 | 1537 | ||
| 1538 | * atapi_dmadir: Enable ATAPI DMADIR bridge support | 1538 | * atapi_dmadir: Enable ATAPI DMADIR bridge support |
| 1539 | 1539 | ||
| 1540 | * disable: Disable this device. | ||
| 1541 | |||
| 1540 | If there are multiple matching configurations changing | 1542 | If there are multiple matching configurations changing |
| 1541 | the same attribute, the last one is used. | 1543 | the same attribute, the last one is used. |
| 1542 | 1544 | ||