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: (232 commits)
  USB: Add USB-ID for Multiplex RC serial adapter to cp210x.c
  xhci: Clean up 32-bit build warnings.
  USB: update documentation for usbmon
  usb: usb-storage doesn't support dynamic id currently, the patch disables the feature to fix an oops
  drivers/usb/class/cdc-acm.c: clear dangling pointer
  drivers/usb/dwc3/dwc3-pci.c: introduce missing kfree
  drivers/usb/host/isp1760-if.c: introduce missing kfree
  usb: option: add ZD Incorporated HSPA modem
  usb: ch9: fix up MaxStreams helper
  USB: usb-skeleton.c: cleanup open_count
  USB: usb-skeleton.c: fix open/disconnect race
  xhci: Properly handle COMP_2ND_BW_ERR
  USB: remove dead code from suspend/resume path
  USB: add quirk for another camera
  drivers: usb: wusbcore: Fix dependency for USB_WUSB
  xhci: Better debugging for critical host errors.
  xhci: Be less verbose during URB cancellation.
  xhci: Remove debugging about ring structure allocation.
  xhci: Remove debugging about toggling cycle bits.
  xhci: Remove debugging for individual transfers.
  ...

diff --cc Documentation/feature-removal-schedule.txt
Simple merge

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

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

diff --cc arch/arm/mach-s3c2416/mach-smdk2416.c
Simple merge

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

diff --cc drivers/usb/dwc3/core.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/gadget/epautoconf.c
Simple merge

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

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

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

diff --cc drivers/usb/gadget/s3c2410_udc.c
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/isp1760-if.c
Simple merge

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

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

diff --cc drivers/usb/renesas_usbhs/mod.c
Simple merge

diff --cc drivers/usb/renesas_usbhs/mod_host.c
index 7955de5899512ecff50c099ab084a35a36a10f07,df8363d252a5d46b8e593115fc82fac46aec618a..1834cf50888cbc8a6832e5250a8ccd8dbdddaee5
--- 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,14 -1515,7 +1515,8 @@@ 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);
-       if (!pipe_info) {
-               dev_err(dev, "Could not allocate pipe_info\n");
-               goto usbhs_mod_host_probe_err;
-       }
- 
        /*
         * CAUTION
         *

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

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 drivers/usb/storage/usb.c
Simple merge

diff --cc drivers/usb/usb-skeleton.c
Simple merge

diff --cc fs/fat/namei_vfat.c
Simple merge

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