Merge branch 'usb-next' into musb-merge

* usb-next: (132 commits)
  USB: uas: Use GFP_NOIO instead of GFP_KERNEL in I/O submission path
  USB: uas: Ensure we only bind to a UAS interface
  USB: uas: Rename sense pipe and sense urb to status pipe and status urb
  USB: uas: Use kzalloc instead of kmalloc
  USB: uas: Fix up the Sense IU
  usb: musb: core: kill unneeded #include's
  DA8xx: assign name to MUSB IRQ resource
  usb: gadget: g_ncm added
  usb: gadget: f_ncm.c added
  usb: gadget: u_ether: prepare for NCM
  usb: pch_udc: Fix setup transfers with data out
  usb: pch_udc: Fix compile error, warnings and checkpatch warnings
  usb: add ab8500 usb transceiver driver
  USB: gadget: Implement runtime PM for MSM bus glue driver
  USB: gadget: Implement runtime PM for ci13xxx gadget
  USB: gadget: Add USB controller driver for MSM SoC
  USB: gadget: Introduce ci13xxx_udc_driver struct
  USB: gadget: Initialize ci13xxx gadget device's coherent DMA mask
  USB: gadget: Fix "scheduling while atomic" bugs in ci13xxx_udc
  USB: gadget: Separate out PCI bus code from ci13xxx_udc
  ...

diff --cc arch/sh/Kconfig
Simple merge

diff --cc drivers/media/video/tlg2300/pd-main.c
Simple merge

diff --cc drivers/usb/core/hcd.c
Simple merge

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

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

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

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

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

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

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

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

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

diff --cc drivers/usb/host/ehci.h
index ba8eab3,fd1c53d..799ac16
--- 1/drivers/usb/host/ehci.h
--- 2/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@@ -131,8 -130,8 +131,9 @@@ struct ehci_hcd {                  /* one per controll
        unsigned                has_amcc_usb23:1;
        unsigned                need_io_watchdog:1;
        unsigned                broken_periodic:1;
+       unsigned                amd_l1_fix:1;
        unsigned                fs_i_thresh:1;  /* Intel iso scheduling */
 +      unsigned                use_dummy_qh:1; /* AMD Frame List table quirk*/
  
        /* required for usb32 quirk */
        #define OHCI_CTRL_HCFS          (3 << 6)

diff --cc drivers/usb/mon/mon_bin.c
Simple merge

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

diff --cc drivers/usb/musb/musb_core.c
index 365a4fa,7816c01..07cf394
--- 1/drivers/usb/musb/musb_core.c
--- 2/drivers/usb/musb/musb_core.c
+++ b/drivers/usb/musb/musb_core.c
@@@ -1049,15 -1037,8 +1038,13 @@@ static void musb_shutdown(struct platfo
        spin_lock_irqsave(&musb->lock, flags);
        musb_platform_disable(musb);
        musb_generic_disable(musb);
-       if (musb->clock)
-               clk_put(musb->clock);
        spin_unlock_irqrestore(&musb->lock, flags);
  
 +      if (!is_otg_enabled(musb) && is_host_enabled(musb))
 +              usb_remove_hcd(musb_to_hcd(musb));
 +      musb_writeb(musb->mregs, MUSB_DEVCTL, 0);
 +      musb_platform_exit(musb);
 +
        /* FIXME power down */
  }
  

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

diff --cc drivers/usb/musb/musb_regs.h
Simple merge

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

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

diff --cc drivers/usb/storage/uas.c
Simple merge

diff --cc include/linux/usb.h
Simple merge

diff --cc include/linux/usb/musb.h
Simple merge