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

Conflicts:
	drivers/usb/gadget/udc-core.c
	drivers/usb/host/ehci-tegra.c
	drivers/usb/musb/omap2430.c
	drivers/usb/musb/tusb6010.c

diff --cc drivers/usb/Makefile
Simple merge

diff --cc drivers/usb/gadget/udc-core.c
index 13e25f80fc201f347784ace2f35c7003850f381a,3122ab942f75bcab0685f00d692423012705cfd8..546bfda3059a6b119935cbf273de9fd8fef1500e
--- 1/drivers/usb/gadget/udc-core.c
--- 2/drivers/usb/gadget/udc-core.c
+++ b/drivers/usb/gadget/udc-core.c
@@@ -105,6 -106,13 +106,13 @@@ EXPORT_SYMBOL_GPL(usb_gadget_unmap_requ
  
  /* ------------------------------------------------------------------------- */
  
 -      sysfs_notify(&gadget->dev.kobj, NULL, "status");
+ static void usb_gadget_state_work(struct work_struct *work)
+ {
+       struct usb_gadget       *gadget = work_to_gadget(work);
+ 
++      sysfs_notify(&gadget->dev.kobj, NULL, "state");
+ }
+ 
  void usb_gadget_set_state(struct usb_gadget *gadget,
                enum usb_device_state state)
  {

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

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

diff --cc drivers/usb/musb/omap2430.c
index f44e8b5e00c94b3b22ddf06b632041e0c462b060,ebb46eca1791144f6bd3bba61c7fd26ad21d090a..59d2245db1c81ce228d7607aa1176e56bbfb9082
--- 1/drivers/usb/musb/omap2430.c
--- 2/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@@ -481,8 -481,8 +481,8 @@@ static u64 omap2430_dmamask = DMA_BIT_M
  
  static int omap2430_probe(struct platform_device *pdev)
  {
 -      struct resource                 musb_resources[2];
 +      struct resource                 musb_resources[3];
-       struct musb_hdrc_platform_data  *pdata = pdev->dev.platform_data;
+       struct musb_hdrc_platform_data  *pdata = dev_get_platdata(&pdev->dev);
        struct omap_musb_board_data     *data;
        struct platform_device          *musb;
        struct omap2430_glue            *glue;

diff --cc drivers/usb/musb/tusb6010.c
index 6f8a9ca96ae753f31b637d0f0c08c1d27a550699,2196ee6e79fef70b6dfacc025d65a1bc3aff43e8..107f95a99a6a0fe661596a7741b06591d763798f
--- 1/drivers/usb/musb/tusb6010.c
--- 2/drivers/usb/musb/tusb6010.c
+++ b/drivers/usb/musb/tusb6010.c
@@@ -1156,8 -1156,8 +1156,8 @@@ static u64 tusb_dmamask = DMA_BIT_MASK(
  
  static int tusb_probe(struct platform_device *pdev)
  {
 -      struct resource musb_resources[2];
 +      struct resource musb_resources[3];
-       struct musb_hdrc_platform_data  *pdata = pdev->dev.platform_data;
+       struct musb_hdrc_platform_data  *pdata = dev_get_platdata(&pdev->dev);
        struct platform_device          *musb;
        struct tusb6010_glue            *glue;
  

diff --cc drivers/usb/phy/Kconfig
index b57514ba486a43d5e11df0cd487d57b9fad0ba2f,f5ea339ec155270ad886c90cf4d3f46bc78d7331..544395879f9380bea5e682bf46c935a7c41ce8d3
--- 1/drivers/usb/phy/Kconfig
--- 2/drivers/usb/phy/Kconfig
+++ b/drivers/usb/phy/Kconfig
@@@ -85,8 -78,8 +79,9 @@@ config OMAP_USB
  
  config OMAP_USB3
        tristate "OMAP USB3 PHY Driver"
 +      depends on ARCH_OMAP2PLUS || COMPILE_TEST
        select OMAP_CONTROL_USB
+       select USB_PHY
        help
          Enable this to support the USB3 PHY that is part of SOC. This
          driver takes care of all the PHY functionality apart from comparator.

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