Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6

[linux-2.6] / Documentation / usb / usb-serial.txt

diff --git a/Documentation/usb/usb-serial.txt b/Documentation/usb/usb-serial.txt
index 2899628f9daf2ecd1243c103e7389aae90b47fac..8dc2bacc8f1f4b6048ef99461df310330375a111 100644 (file)
--- a/Documentation/usb/usb-serial.txt
+++ b/Documentation/usb/usb-serial.txt
@@ -223,7 +223,7 @@ Cypress M8 CY4601 Family Serial Driver
                -Cypress HID->COM RS232 adapter
        
                Note: Cypress Semiconductor claims no affiliation with the
-                       the hid->com device.
+                       hid->com device.
 
        Most devices using chipsets under the CY4601 family should
      work with the driver.  As long as they stay true to the CY4601
@@ -422,7 +422,7 @@ Options supported:
   debug                        - extra verbose debugging info
                          (default: 0; nonzero enables)
   use_lowlatency       - use low_latency flag to speed up tty layer
-                         when reading from from the device.
+                         when reading from the device.
                          (default: 0; nonzero enables)
 
   See http://www.uuhaus.de/linux/palmconnect.html for up-to-date