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)
commit7483948fdd31a8642ef0288aab6f368b98d53c29
tree031020a5553701d2aae8dddb0fa509aa65854eb1
parent22a416c4e0f2179b57028e084ac0ed2c110333bd
parentfe250923bbbbcbccc9aa7b84d05ee7a060450534
Merge tag 'usb-3.3-rc3' into usb-next

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>
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