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

Conflicts:
	drivers/usb/chipidea/udc.c
	drivers/usb/gadget/net2272.c
	drivers/usb/gadget/net2280.c

diff --cc drivers/Makefile
Simple merge

diff --cc drivers/power/Kconfig
Simple merge

diff --cc drivers/usb/chipidea/udc.c
index e502e4807812f86e0073b047a10eb78ce34bcabf,9bddf3f633f1bff260070972402450677ada54f5..68bc9babf67a5064135d90ce7eb3b019bc580aff
--- 1/drivers/usb/chipidea/udc.c
--- 2/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@@ -1700,19 -1742,18 +1684,13 @@@ static int udc_start(struct ci13xxx *ci
                retval = hw_device_reset(ci, USBMODE_CM_DC);
                if (retval)
                        goto put_transceiver;
 -              hw_enable_vbus_intr(ci);
        }
  
-       retval = device_register(&ci->gadget.dev);
-       if (retval) {
-               put_device(&ci->gadget.dev);
 -      retval = dbg_create_files(ci->dev);
 -      if (retval)
--              goto put_transceiver;
-       }
--
        if (!IS_ERR_OR_NULL(ci->transceiver)) {
                retval = otg_set_peripheral(ci->transceiver->otg,
                                                &ci->gadget);
                if (retval)
-                       goto unreg_device;
 -                      goto remove_dbg;
++                      goto put_transceiver;
        }
  
        retval = usb_add_gadget_udc(dev, &ci->gadget);
@@@ -1732,8 -1773,8 +1710,6 @@@ remove_trans
        }
  
        dev_err(dev, "error = %i\n", retval);
- unreg_device:
-       device_unregister(&ci->gadget.dev);
 -remove_dbg:
 -      dbg_remove_files(ci->dev);
  put_transceiver:
        if (!IS_ERR_OR_NULL(ci->transceiver) && ci->global_phy)
                usb_put_phy(ci->transceiver);
@@@ -1768,7 -1812,7 +1744,6 @@@ static void udc_stop(struct ci13xxx *ci
                if (ci->global_phy)
                        usb_put_phy(ci->transceiver);
        }
-       device_unregister(&ci->gadget.dev);
 -      dbg_remove_files(ci->dev);
        /* my kobject is dynamic, I swear! */
        memset(&ci->gadget, 0, sizeof(ci->gadget));
  }

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

diff --cc drivers/usb/gadget/net2272.c
index 32524b631959eda7a62e2e2b005c3ba7a2e88f4b,ce450a18aa198b2b03cf79dacf4efa878f8a8945..f1e50a3e322d9368d5e7d8f968f423ef9d928153
--- 1/drivers/usb/gadget/net2272.c
--- 2/drivers/usb/gadget/net2272.c
+++ b/drivers/usb/gadget/net2272.c
@@@ -58,8 -58,7 +58,7 @@@ static const char * const ep_name[] = 
        "ep-a", "ep-b", "ep-c",
  };
  
- #define DMA_ADDR_INVALID      (~(dma_addr_t)0)
 -#ifdef CONFIG_USB_GADGET_NET2272_DMA
 +#ifdef CONFIG_USB_NET2272_DMA
  /*
   * use_dma: the NET2272 can use an external DMA controller.
   * Note that since there is no generic DMA api, some functions,

diff --cc drivers/usb/gadget/net2280.c
index 3bd0f992fb49aebe5b5c4dc9e45356bb77c01581,e869188bc2b1c1172ecf73145ee90ad3460628c9..fbd006ab31d3bf1f25151dab6be694279f4d8928
--- 1/drivers/usb/gadget/net2280.c
--- 2/drivers/usb/gadget/net2280.c
+++ b/drivers/usb/gadget/net2280.c
@@@ -1924,7 -1920,7 +1920,6 @@@ static int net2280_start(struct usb_gad
  err_func:
        device_remove_file (&dev->pdev->dev, &dev_attr_function);
  err_unbind:
-       dev->gadget.dev.driver = NULL;
 -      driver->unbind (&dev->gadget);
        dev->driver = NULL;
        return retval;
  }

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

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

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

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

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

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

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

diff --cc drivers/usb/phy/phy-isp1301-omap.c
Simple merge

diff --cc drivers/usb/phy/phy-mv-u3d-usb.c
Simple merge

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

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