Merge branch 'for-2639/i2c/i2c-u2c12' into for-linus/2639/i2c-12

[pandora-kernel.git] / drivers / usb / serial / ChangeLog.history

diff --git a/drivers/usb/serial/ChangeLog.history b/drivers/usb/serial/ChangeLog.history
index c1b2799..f13fd48 100644 (file)
--- a/drivers/usb/serial/ChangeLog.history
+++ b/drivers/usb/serial/ChangeLog.history
@@ -715,7 +715,7 @@ io_edgeport.c Change Log comments:
 
  0.2 (01/30/2000) greg kroah-hartman
        Milestone 1 release.
-       Device is found by USB subsystem, enumerated, fimware is downloaded
+       Device is found by USB subsystem, enumerated, firmware is downloaded
        and the descriptors are printed to the debug log, config is set, and
        green light starts to blink. Open port works, and data can be sent
        and received at the default settings of the UART. Loopback connector