--- /linux-2.6.21/Documentation/usb/gadget_serial.txt	2007-04-26 04:08:32.000000000 +0300
+++ /linux/Documentation/usb/gadget_serial.txt	2007-06-12 13:20:12.000000000 +0300
@@ -1,6 +1,6 @@
 
-                 Linux Gadget Serial Driver v2.0
-                           11/20/2004
+                 Linux Gadget Serial Driver v3.1
+                           06/11/2007
 
 
 License and Disclaimer
@@ -37,8 +37,8 @@
 This document assumes that you are familiar with Linux and
 Windows and know how to configure and build Linux kernels, run
 standard utilities, use minicom and HyperTerminal, and work with
-USB and serial devices.  It also assumes you configure the Linux
-gadget and usb drivers as modules.
+USB and serial devices.  It also assumes that you can configure
+the Linux gadget and usb drivers as modules.
 
 
 Overview
@@ -100,7 +100,7 @@
 To use the gadget serial driver you must configure the Linux gadget
 side kernel for "Support for USB Gadgets", for a "USB Peripheral
 Controller" (for example, net2280), and for the "Serial Gadget"
-driver.  All this are listed under "USB Gadget Support" when
+driver.  All these are listed under "USB Gadget Support" when
 configuring the kernel.  Then rebuild and install the kernel or
 modules.
 
@@ -137,25 +137,39 @@
 To use the Windows ACM driver you must have the files "gserial.inf"
 and "usbser.sys" together in a folder on the Windows machine.
 
-The "gserial.inf" file is given here.
+The "gserial.inf" file for windows 98,Me,2000,XP,2003,Vista is given
+below and has passed chkinf 2.5 tests.  It supports x86, AMD64, IA64
+systems now!  It has 1 non important error about missing WHQL digital
+signature catalog (.cat) file directive.  If anyone wants to pay ms
+for digital signature, remove the ";" in front of the CatalogFile.
 
 -------------------- CUT HERE --------------------
 [Version]
-Signature="$Windows NT$"
-Class=Ports
-ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318}
-Provider=%LINUX%
-DriverVer=08/17/2004,0.0.2.0
+Signature    = "$Chicago$"
+Class        = Ports
+ClassGuid    = {4D36E978-E325-11CE-BFC1-08002BE10318}
+Provider     = %TUX%
+DriverVer    = 06/11/2007,3.1.0.0
+;CatalogFile  = Gserial.cat
+
 ; Copyright (C) 2004 Al Borchers (alborchers@steinerpoint.com)
+; Copyright (C) 2007 Ioannis Barkas (risc4all@yahoo.com)
+; Copyright (C) 2007 Nikos Barkas (doubl3nuts@yahoo.com)
 
 [Manufacturer]
-%LINUX%=GSerialDeviceList
+%TUX%=GSerialDeviceList, NTx86, NTamd64, NTia64
 
 [GSerialDeviceList]
 %GSERIAL%=GSerialInstall, USB\VID_0525&PID_A4A7
 
-[DestinationDirs]
-DefaultDestDir=10,System32\Drivers
+[GSerialDeviceList.NTx86]
+%GSERIAL%=GSerialInstall, USB\VID_0525&PID_A4A7
+
+[GSerialDeviceList.NTamd64]
+%GSERIAL%=GSerialInstall, USB\VID_0525&PID_A4A7
+
+[GSerialDeviceList.NTia64]
+%GSERIAL%=GSerialInstall, USB\VID_0525&PID_A4A7
 
 [GSerialInstall]
 CopyFiles=GSerialCopyFiles
@@ -164,6 +178,16 @@
 [GSerialCopyFiles]
 usbser.sys
 
+[SourceDisksFiles]
+usbser.sys=1
+
+[SourceDisksNames]
+1=%Linux_Gadget_Rocks%,,,
+
+[DestinationDirs]
+DefaultDestDir           = 10
+GSerialCopyFiles         = 12
+
 [GSerialAddReg]
 HKR,,DevLoader,,*ntkern
 HKR,,NTMPDriver,,usbser.sys
@@ -181,9 +205,10 @@
 LoadOrderGroup = Base
 
 [Strings]
-LINUX = "Linux"
-GSERIAL = "Gadget Serial"
+TUX                  = "Linux"
+GSERIAL              = "Gadget Serial"
 GSERIAL_DISPLAY_NAME = "USB Gadget Serial Driver"
+LINUX_GADGET_ROCKS   = "Linux USB Gadget Serial Driver"
 -------------------- CUT HERE --------------------
 
 The "usbser.sys" file comes with various versions of Windows.
@@ -191,8 +216,8 @@
 
   C:\WINDOWS\Driver Cache\i386\driver.cab
 
-Or it can be found on the Windows 98SE CD in the "win98" folder
-in the "DRIVER11.CAB" through "DRIVER20.CAB" cab files.  You will
+Or it can be found on the Windows Me CD in the "win9x" folder
+in the "DRIVER5.CAB" through "DRIVER7.CAB" cab files.  You will
 need the DOS "expand" program, the Cygwin "cabextract" program, or
 a similar program to unpack these cab files and extract "usbser.sys".
 
@@ -203,10 +228,11 @@
 
 (Thanks to Nishant Kamat for pointing out this DOS command.)
 
-When the gadget serial driver is loaded and the USB device connected
-to the Windows host with a USB cable, Windows should recognize the
-gadget serial device and ask for a driver.  Tell Windows to find the
-driver in the folder that contains "gserial.inf" and "usbser.sys".
+When the gadget serial driver is loaded and the USB device is
+connected to the Windows host with a USB cable, Windows should
+recognize the gadget serial device and ask for a driver.  Tell
+Windows to find the driver in the folder that contains "gserial.inf"
+and "usbser.sys".
 
 For example, on Windows XP, when the gadget serial device is first
 plugged in, the "Found New Hardware Wizard" starts up.  Select