• Linus Torvalds's avatar
    Merge tag 'usb-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 9fc37779
    Linus Torvalds authored
    Pull USB patches from Greg Kroah-Hartman:
     "Here's the big USB patch set for the 3.6-rc1 merge window.
    
      Lots of little changes in here, primarily for gadget controllers and
      drivers.  There's some scsi changes that I think also went in through
      the scsi tree, but they merge just fine.  All of these patches have
      been in the linux-next tree for a while now.
    
      Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
    
    Fix up trivial conflicts in include/scsi/scsi_device.h (same libata
    conflict that Jeff had already encountered)
    
    * tag 'usb-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (207 commits)
      usb: Add USB_QUIRK_RESET_RESUME for all Logitech UVC webcams
      usb: Add quirk detection based on interface information
      usb: s3c-hsotg: Add header file protection macros in s3c-hsotg.h
      USB: ehci-s5p: Add vbus setup function to the s5p ehci glue layer
      USB: add USB_VENDOR_AND_INTERFACE_INFO() macro
      USB: notify phy when root hub port connect change
      USB: remove 8 bytes of padding from usb_host_interface on 64 bit builds
      USB: option: add ZTE MF821D
      USB: sierra: QMI mode MC7710 moved to qcserial
      USB: qcserial: adding Sierra Wireless devices
      USB: qcserial: support generic Qualcomm serial ports
      USB: qcserial: make probe more flexible
      USB: qcserial: centralize probe exit path
      USB: qcserial: consolidate usb_set_interface calls
      USB: ehci-s5p: Add support for device tree
      USB: ohci-exynos: Add support for device tree
      USB: ehci-omap: fix compile failure(v1)
      usb: host: tegra: pass correct pointer in ehci_setup()
      USB: ehci-fsl: Update ifdef check to work on 64-bit ppc
      USB: serial: keyspan: Removed unrequired parentheses.
      ...
    9fc37779
clock3xxx_data.c 108 KB