Merge branch 'master' into upstream

2 files changed, 9 insertions, 7 deletions

diff --git a/Documentation/usb/error-codes.txt b/Documentation/usb/error-codes.txt
index 867f4c38f356..39c68f8c4e6c 100644
--- a/Documentation/usb/error-codes.txt
+++ b/Documentation/usb/error-codes.txt
@@ -98,13 +98,13 @@ one or more packets could finish before an error stops further endpoint I/O.
                         error, a failure to respond (often caused by
                         device disconnect), or some other fault.
 
--ETIMEDOUT (**)         No response packet received within the prescribed
+-ETIME (**)             No response packet received within the prescribed
                         bus turn-around time.  This error may instead be
                         reported as -EPROTO or -EILSEQ.
 
-                        Note that the synchronous USB message functions
-                        also use this code to indicate timeout expired
-                        before the transfer completed.
+-ETIMEDOUT              Synchronous USB message functions use this code
+                        to indicate timeout expired before the transfer
+                        completed, and no other error was reported by HC.
 
 -EPIPE (**)             Endpoint stalled.  For non-control endpoints,
                         reset this status with usb_clear_halt().
@@ -163,6 +163,3 @@ usb_get_*/usb_set_*():
 usb_control_msg():
 usb_bulk_msg():
 -ETIMEDOUT              Timeout expired before the transfer completed.
-                        In the future this code may change to -ETIME,
-                        whose definition is a closer match to this sort
-                        of error.
diff --git a/Documentation/usb/usb-serial.txt b/Documentation/usb/usb-serial.txt
index 02b0f7beb6d1..a2dee6e6190d 100644
--- a/Documentation/usb/usb-serial.txt
+++ b/Documentation/usb/usb-serial.txt
@@ -433,6 +433,11 @@ Options supported:
   See http://www.uuhaus.de/linux/palmconnect.html for up-to-date
   information on this driver.
 
+AIRcable USB Dongle Bluetooth driver
+  If there is the cdc_acm driver loaded in the system, you will find that the
+  cdc_acm claims the device before AIRcable can. This is simply corrected
+  by unloading both modules and then loading the aircable module before
+  cdc_acm module
 
 Generic Serial driver