diff options
| author | Alex Shi <alex.shi@linaro.org> | 2014-01-10 10:50:57 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2014-01-10 10:50:57 +0800 |
| commit | 450cdfa9c5713551ab1438ab210679868b52a994 (patch) | |
| tree | edd98f9698aa88af55a3a1ee3de62e52917c39ba /Documentation | |
| parent | bf78886fb6c4131885f84f3eaaf7474509d40e51 (diff) | |
| parent | 8b4ed85b8404ffe7e10ee410c4df3968b86f0793 (diff) | |
Merge remote-tracking branch 'stable/linux-3.10.y' into linux-linaro-lsk
Conflicts:
arch/arm64/kernel/smp.c
Signed-off-by: Alex Shi <alex.shi@linaro.org>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index ba7daaa688f..15b24a2be6b 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1465,6 +1465,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. * dump_id: dump IDENTIFY data. + * atapi_dmadir: Enable ATAPI DMADIR bridge support + + * disable: Disable this device. + If there are multiple matching configurations changing the same attribute, the last one is used. |