diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-01-05 06:34:29 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-01-05 06:34:29 -0500 |
| commit | ef0b8b9a521c65201bfca9747ee1bf374296133c (patch) | |
| tree | 644c3390c07d06fb7807182a4935f7c3f675b157 /Documentation/kernel-parameters.txt | |
| parent | 5c12af0c41e3417e1939095325920463b5f8e726 (diff) | |
| parent | d6e0a2dd12f4067a5bcefb8bbd8ddbeff800afbc (diff) | |
Merge tag 'v3.13-rc7' into x86/efi-kexec to resolve conflicts
Conflicts:
arch/x86/platform/efi/efi.c
drivers/firmware/efi/Kconfig
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 e06e99303dd3..d7e736c53e51 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -1535,6 +1535,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. | |||
| 1535 | 1535 | ||
| 1536 | * atapi_dmadir: Enable ATAPI DMADIR bridge support | 1536 | * atapi_dmadir: Enable ATAPI DMADIR bridge support |
| 1537 | 1537 | ||
| 1538 | * disable: Disable this device. | ||
| 1539 | |||
| 1538 | If there are multiple matching configurations changing | 1540 | If there are multiple matching configurations changing |
| 1539 | the same attribute, the last one is used. | 1541 | the same attribute, the last one is used. |
| 1540 | 1542 | ||