aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2016-05-05 13:13:37 +0800
committerAlex Shi <alex.shi@linaro.org>2016-05-05 13:13:37 +0800
commitb41e65f55a30b53bfaf609ed4f794428ae532db2 (patch)
treedc1e839e56d805ca704108f41505b409d6670139 /Documentation
parentc52149e0ea4b02a021e6ae528bc567479725ea79 (diff)
parent834125557e0a4e5afafee3caf79696078d0820ae (diff)
downloadlinux-linaro-stable-b41e65f55a30b53bfaf609ed4f794428ae532db2.tar.gz
Merge remote-tracking branch 'lts/linux-3.18.y' into linux-linaro-lsk-v3.18
Conflicts: include/linux/compiler-gcc.h
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 61f9273d0c46..b2bdea1953e6 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -3651,6 +3651,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
sector if the number is odd);
i = IGNORE_DEVICE (don't bind to this
device);
+ j = NO_REPORT_LUNS (don't use report luns
+ command, uas only);
l = NOT_LOCKABLE (don't try to lock and
unlock ejectable media);
m = MAX_SECTORS_64 (don't transfer more