Merge 3.2-rc3 into usb-linus

This pulls in the latest USB bugfixes and helps a few of the drivers
merge nicer in the future due to changes in both branches.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index a11dbc85d08b..3162a7da8724 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -470,7 +470,7 @@ config USB_LANGWELL
            gadget drivers to also be dynamically linked.
 
 config USB_EG20T
-        tristate "Intel EG20T PCH/OKI SEMICONDUCTOR ML7213 IOH UDC"
+        tristate "Intel EG20T PCH/LAPIS Semiconductor IOH(ML7213/ML7831) UDC"
         depends on PCI
         select USB_GADGET_DUALSPEED
         help
@@ -486,10 +486,11 @@ config USB_EG20T
           This driver dose not support interrupt transfer or isochronous
           transfer modes.
 
-          This driver also can be used for OKI SEMICONDUCTOR's ML7213 which is
+          This driver also can be used for LAPIS Semiconductor's ML7213 which is
           for IVI(In-Vehicle Infotainment) use.
-          ML7213 is companion chip for Intel Atom E6xx series.
-          ML7213 is completely compatible for Intel EG20T PCH.
+          ML7831 is for general purpose use.
+          ML7213/ML7831 is companion chip for Intel Atom E6xx series.
+          ML7213/ML7831 is completely compatible for Intel EG20T PCH.
 
 config USB_CI13XXX_MSM
         tristate "MIPS USB CI13xxx for MSM"