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

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/arm/mach-omap2/board-n8x0.c
Simple merge

diff --cc drivers/usb/class/cdc-acm.c
Simple merge

diff --cc drivers/usb/dwc3/debugfs.c
index fcfa91517ea1b696523583110f8a20470fc16dc2,87d403df1f3f763787c1c905282f05141a0c96c5..433c97c15fc5447f6cbfb4c5b974ae3fbe674ff2
--- 1/drivers/usb/dwc3/debugfs.c
--- 2/drivers/usb/dwc3/debugfs.c
+++ b/drivers/usb/dwc3/debugfs.c
@@@ -50,7 -49,13 +49,8 @@@
  #include "core.h"
  #include "gadget.h"
  #include "io.h"
+ #include "debug.h"
  
 -struct dwc3_register {
 -      const char      *name;
 -      u32             offset;
 -};
 -
  #define dump_register(nm)                             \
  {                                                     \
        .name   = __stringify(nm),                      \

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

diff --cc drivers/usb/host/hwa-hc.c
Simple merge

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

diff --cc drivers/usb/host/ohci-au1xxx.c
Simple merge

diff --cc drivers/usb/misc/isight_firmware.c
Simple merge

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

diff --cc drivers/usb/otg/fsl_otg.c
Simple merge

diff --cc drivers/usb/renesas_usbhs/mod_host.c
index 7955de5899512ecff50c099ab084a35a36a10f07,75659e0c735d3dc787f3bfb6d7e1aaaa96996af4..e0229e1e9c756ef9b3d3662c6be44754b743d8bd
--- 1/drivers/usb/renesas_usbhs/mod_host.c
--- 2/drivers/usb/renesas_usbhs/mod_host.c
+++ b/drivers/usb/renesas_usbhs/mod_host.c
@@@ -1267,9 -1267,8 +1267,9 @@@ int usbhs_mod_host_probe(struct usbhs_p
                dev_err(dev, "Failed to create hcd\n");
                return -ENOMEM;
        }
 +      hcd->has_tt = 1; /* for low/full speed */
  
-       pipe_info = kzalloc(sizeof(*pipe_info) * pipe_size, GFP_KERNEL);
+       pipe_info = kcalloc(pipe_size, sizeof(*pipe_info), GFP_KERNEL);
        if (!pipe_info) {
                dev_err(dev, "Could not allocate pipe_info\n");
                goto usbhs_mod_host_probe_err;

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

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

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

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

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

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

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

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

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

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

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

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

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

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