]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
Merge tag 'usb-3.3-rc3' into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Feb 2012 19:12:55 +0000 (11:12 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Feb 2012 19:13:53 +0000 (11:13 -0800)
This is done to resolve a merge conflict with:
drivers/usb/class/cdc-wdm.c
and to better handle future patches for this driver as it is under
active development at the moment.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
drivers/usb/class/cdc-wdm.c
drivers/usb/host/ehci-fsl.c
drivers/usb/host/ehci-fsl.h
drivers/usb/serial/cp210x.c
drivers/usb/serial/io_ti.c
drivers/usb/storage/realtek_cr.c
include/linux/usb.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge