1 files changed, 7 insertions, 0 deletions

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 777dc8a32df8..ab95d3ada5c7 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1787,6 +1787,11 @@ and is between 256 and 4096 characters. It is defined in the file
                         waiting for the ACK, so if this is set too high
                         interrupts *may* be lost!
 
+        omap_mux=       [OMAP] Override bootloader pin multiplexing.
+                        Format: <mux_mode0.mode_name=value>...
+                        For example, to override I2C bus2:
+                        omap_mux=i2c2_scl.i2c2_scl=0x100,i2c2_sda.i2c2_sda=0x100
+
         opl3=           [HW,OSS]
                         Format: <io>
 
@@ -2663,6 +2668,8 @@ and is between 256 and 4096 characters. It is defined in the file
                         to a common usb-storage quirk flag as follows:
                                 a = SANE_SENSE (collect more than 18 bytes
                                         of sense data);
+                                b = BAD_SENSE (don't collect more than 18
+                                        bytes of sense data);
                                 c = FIX_CAPACITY (decrease the reported
                                         device capacity by one sector);
                                 h = CAPACITY_HEURISTICS (decrease the