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

diff --cc arch/arm/configs/davinci_all_defconfig
index 2f8ff65e3ef12a6e4f9aac7f38c9e8d7a06169ab,5089ced52c9c41c4949e4d9938c1516ea50a564b..f95f72d62db73de315e4688953ae8ebb285412c4
--- 1/arch/arm/configs/davinci_all_defconfig
--- 2/arch/arm/configs/davinci_all_defconfig
+++ b/arch/arm/configs/davinci_all_defconfig
@@@ -157,9 -157,9 +157,8 @@@ CONFIG_HID_SAMSUNG=
  CONFIG_HID_SONY=m
  CONFIG_HID_SUNPLUS=m
  CONFIG_USB=m
- CONFIG_USB_DEVICEFS=y
  CONFIG_USB_MON=m
  CONFIG_USB_MUSB_HDRC=m
 -CONFIG_USB_MUSB_PERIPHERAL=y
  CONFIG_USB_GADGET_MUSB_HDRC=y
  CONFIG_MUSB_PIO_ONLY=y
  CONFIG_USB_STORAGE=m

diff --cc arch/arm/configs/keystone_defconfig
Simple merge

diff --cc arch/arm/configs/omap2plus_defconfig
Simple merge

diff --cc drivers/gpu/drm/udl/udl_main.c
Simple merge

diff --cc drivers/net/wireless/orinoco/orinoco_usb.c
Simple merge

diff --cc drivers/usb/core/hub.c
index 229a73f64304d1395e76e8ec0a277e1eba013da8,6346fb2acbd7e25a010801d92ecb075a8cbe973d..879b66e13370b5fc80fda8709d12dbbb2bd7d788
--- 1/drivers/usb/core/hub.c
--- 2/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@@ -3872,6 -3966,6 +3977,12 @@@ EXPORT_SYMBOL_GPL(usb_disable_ltm)
  void usb_enable_ltm(struct usb_device *udev) { }
  EXPORT_SYMBOL_GPL(usb_enable_ltm);
  
++static int hub_handle_remote_wakeup(struct usb_hub *hub, unsigned int port,
++              u16 portstatus, u16 portchange)
++{
++      return 0;
++}
++
  #endif        /* CONFIG_PM */
  
  

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

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

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

diff --cc drivers/usb/host/xhci-mem.c
index b1a8a5f4bbb81e27e8ef4334425e8244158c79f0,6a57e81c2a766f168cebbe7b848900f80df3fee8..8056d90690ee1bff397b0fa689f3ab9175622a6b
--- 1/drivers/usb/host/xhci-mem.c
--- 2/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@@ -1816,22 -1816,8 +1816,18 @@@ void xhci_mem_cleanup(struct xhci_hcd *
                xhci_ring_free(xhci, xhci->cmd_ring);
        xhci->cmd_ring = NULL;
        xhci_dbg_trace(xhci, trace_xhci_dbg_init, "Freed command ring");
-       list_for_each_entry_safe(cur_cd, next_cd,
-                       &xhci->cancel_cmd_list, cancel_cmd_list) {
-               list_del(&cur_cd->cancel_cmd_list);
-               kfree(cur_cd);
-       }
+       xhci_cleanup_command_queue(xhci);
  
 +      num_ports = HCS_MAX_PORTS(xhci->hcs_params1);
 +      for (i = 0; i < num_ports; i++) {
 +              struct xhci_interval_bw_table *bwt = &xhci->rh_bw[i].bw_table;
 +              for (j = 0; j < XHCI_MAX_INTERVAL; j++) {
 +                      struct list_head *ep = &bwt->interval_bw[j].endpoints;
 +                      while (!list_empty(ep))
 +                              list_del_init(ep->next);
 +              }
 +      }
 +
        for (i = 1; i < MAX_HC_SLOTS; ++i)
                xhci_free_virt_device(xhci, i);
  

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

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