Merge remote-tracking branch 'usb/usb-next'

Conflicts:
	drivers/usb/gadget/Kconfig
	drivers/usb/host/ehci-vt8500.c
	drivers/usb/musb/omap2430.c
	drivers/usb/phy/omap-usb2.c

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-omap2/board-omap3evm.c
Simple merge

diff --cc drivers/usb/gadget/Kconfig
index a1bd951f9cb7f7287a0be8d6d45d4165ab44cd69,c5c6fa60910d3fe309cde04c45f13c46054cc2b0..5a0c541daf893a33a428bedb8d68ec1fa72d4234
--- 1/drivers/usb/gadget/Kconfig
--- 2/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@@ -750,7 -762,8 +762,9 @@@ config USB_GADGET_TARGE
  
  config USB_G_SERIAL
        tristate "Serial Gadget (with CDC ACM and CDC OBEX support)"
 +      depends on TTY
+       select USB_U_SERIAL
+       select USB_F_ACM
        select USB_LIBCOMPOSITE
        help
          The Serial Gadget talks to the Linux-USB generic serial driver.

diff --cc drivers/usb/gadget/at91_udc.c
Simple merge

diff --cc drivers/usb/gadget/fusb300_udc.c
Simple merge

diff --cc drivers/usb/gadget/m66592-udc.c
Simple merge

diff --cc drivers/usb/gadget/pxa25x_udc.c
Simple merge

diff --cc drivers/usb/gadget/r8a66597-udc.c
Simple merge

diff --cc drivers/usb/gadget/s3c-hsotg.c
Simple merge

diff --cc drivers/usb/gadget/s3c-hsudc.c
Simple merge

diff --cc drivers/usb/gadget/u_serial.c
Simple merge

diff --cc drivers/usb/host/ehci-mxc.c
Simple merge

diff --cc drivers/usb/host/ehci-omap.c
Simple merge

diff --cc drivers/usb/host/ehci-vt8500.c
index 7ecf709610ba8eabe4ad66654c8550e9313dc041,98d65bdcb9694a98eeb95c5b2eb1e71566269463..feccea02cb513b4d28b20a9cd87cdef597747ad3
--- 1/drivers/usb/host/ehci-vt8500.c
--- 2/drivers/usb/host/ehci-vt8500.c
+++ b/drivers/usb/host/ehci-vt8500.c
@@@ -16,7 -16,12 +16,13 @@@
   *
   */
  
 +#include <linux/err.h>
+ #include <linux/kernel.h>
+ #include <linux/module.h>
+ #include <linux/usb.h>
+ #include <linux/usb/hcd.h>
+ #include <linux/io.h>
+ #include <linux/dma-mapping.h>
  #include <linux/of.h>
  #include <linux/platform_device.h>
  

diff --cc drivers/usb/musb/musb_dsps.c
Simple merge

diff --cc drivers/usb/otg/mxs-phy.c
Simple merge

diff --cc drivers/usb/serial/Kconfig
Simple merge

diff --cc drivers/usb/serial/ftdi_sio.c
Simple merge

diff --cc drivers/usb/serial/io_ti.c
Simple merge

diff --cc drivers/usb/serial/keyspan.c
Simple merge

diff --cc drivers/usb/serial/mct_u232.c
Simple merge

diff --cc drivers/usb/serial/quatech2.c
Simple merge

diff --cc drivers/usb/serial/sierra.c
Simple merge

diff --cc drivers/usb/serial/ssu100.c
Simple merge

diff --cc drivers/usb/serial/usb_wwan.c
Simple merge