Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

* 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (260 commits)
  usb: renesas_usbhs: fixup inconsistent return from usbhs_pkt_push()
  usb/isp1760: Allow to optionally trigger low-level chip reset via GPIOLIB.
  USB: gadget: midi: memory leak in f_midi_bind_config()
  USB: gadget: midi: fix range check in f_midi_out_open()
  QE/FHCI: fixed the CONTROL bug
  usb: renesas_usbhs: tidyup for smatch warnings
  USB: Fix USB Kconfig dependency problem on 85xx/QoirQ platforms
  EHCI: workaround for MosChip controller bug
  usb: gadget: file_storage: fix race on unloading
  USB: ftdi_sio.c: Use ftdi async_icount structure for TIOCMIWAIT, as in other drivers
  USB: ftdi_sio.c:Fill MSR fields of the ftdi async_icount structure
  USB: ftdi_sio.c: Fill LSR fields of the ftdi async_icount structure
  USB: ftdi_sio.c:Fill TX field of the ftdi async_icount structure
  USB: ftdi_sio.c: Fill the RX field of the ftdi async_icount structure
  USB: ftdi_sio.c: Basic icount infrastructure for ftdi_sio
  usb/isp1760: Let OF bindings depend on general CONFIG_OF instead of PPC_OF .
  USB: ftdi_sio: Support TI/Luminary Micro Stellaris BD-ICDI Board
  USB: Fix runtime wakeup on OHCI
  xHCI/USB: Make xHCI driver have a BOS descriptor.
  usb: gadget: add new usb gadget for ACM and mass storage
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-shmobile/board-mackerel.c
index 17c19dc2560431b99699e28569f52f68f9202cc8,c20612ea5d0e939cafc554f594220faa6ed3a25c..802aa58ef9d8418b14199d5333ed9f80033ff417
--- 1/arch/arm/mach-shmobile/board-mackerel.c
--- 2/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@@ -810,10 -808,9 +810,11 @@@ static struct usbhs_private usbhs1_priv
                },
                .driver_param = {
                        .buswait_bwait  = 4,
+                       .has_otg        = 1,
                        .pipe_type      = usbhs1_pipe_cfg,
                        .pipe_size      = ARRAY_SIZE(usbhs1_pipe_cfg),
 +                      .d0_tx_id       = SHDMA_SLAVE_USB1_TX,
 +                      .d1_rx_id       = SHDMA_SLAVE_USB1_RX,
                },
        },
  };

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

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

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

diff --cc drivers/usb/gadget/uvc.h
Simple merge

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

diff --cc drivers/usb/host/xhci-hub.c
Simple merge

diff --cc drivers/usb/host/xhci-ring.c
Simple merge

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

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

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