diff options
| author | Tejun Heo <tj@kernel.org> | 2014-01-16 09:44:34 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-01-16 09:44:34 -0500 |
| commit | 6e1af69780a4df749d28a129596ed576a0d7996c (patch) | |
| tree | 67f0dee7b39c006dc305d7273db8222633603abf /Documentation | |
| parent | a96cc303e42ad7830dde929aad0046e448a05505 (diff) | |
| parent | 55c82a6c2a513de1d8a20c3b3a769129a1a14d50 (diff) | |
| download | linux-6e1af69780a4df749d28a129596ed576a0d7996c.tar.gz linux-6e1af69780a4df749d28a129596ed576a0d7996c.tar.bz2 linux-6e1af69780a4df749d28a129596ed576a0d7996c.zip | |
Merge branch 'for-3.13-fixes' into for-3.14
A scheduled horkage patch will conflict with HORKAGE changes in
for-3.13-fixes. Pull in to avoid unnecessary merge conflicts.
Signed-off-by: Tejun Heo <tj@kernel.org>
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 50680a59a2ff..b9e9bd854298 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1529,6 +1529,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. * 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. |