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

Conflicts:
	drivers/usb/musb/davinci.c

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

diff --cc drivers/phy/phy-twl4030-usb.c
Simple merge

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

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

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

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

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

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

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

diff --cc drivers/usb/phy/Makefile
Simple merge

diff --cc include/linux/usb/usb_phy_gen_xceiv.h
index 11d85b9c1b081af6a9f4f30ac3c1458766ed4238,42f3b71a97754cb9fde449a8350dc3daee2c06c7..cc8d818a83be40f58ae5ce29a60b08ca9b0ea8f5
--- 1/include/linux/usb/usb_phy_gen_xceiv.h
--- 2/include/linux/usb/usb_phy_gen_xceiv.h
+++ b/include/linux/usb/usb_phy_gen_xceiv.h
@@@ -9,10 -9,11 +9,11 @@@ struct usb_phy_gen_xceiv_platform_data 
  
        /* if set fails with -EPROBE_DEFER if can't get regulator */
        unsigned int needs_vcc:1;
-       unsigned int needs_reset:1;
+       unsigned int needs_reset:1;     /* deprecated */
+       int gpio_reset;
  };
  
 -#if IS_ENABLED(CONFIG_NOP_USB_XCEIV)
 +#if defined(CONFIG_NOP_USB_XCEIV) || (defined(CONFIG_NOP_USB_XCEIV_MODULE) && defined(MODULE))
  /* sometimes transceivers are accessed only through e.g. ULPI */
  extern void usb_nop_xceiv_register(void);
  extern void usb_nop_xceiv_unregister(void);