Merge branch 'usb-3.3-rc4' into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 23 Feb 2012 16:20:44 +0000 (08:20 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 23 Feb 2012 16:21:03 +0000 (08:21 -0800)
commitc69263c66e5b2a5d0c7e5a41c189b1846ae1de92
tree81c6cf0f5b3b05739e2e73b0118077d9dd245182
parent45196cee28a5bcfb6ddbe2bffa4270cbed66ae4b
parent5407a3c3d942e75d4d123d213fd692bce5acc961
Merge branch 'usb-3.3-rc4' into usb-next

This is to pull in the xhci changes and the other fixes and device id
updates that were done in Linus's tree.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/core/hub.c
drivers/usb/host/xhci-mem.c
drivers/usb/serial/cp210x.c
drivers/usb/serial/ti_usb_3410_5052.c
drivers/usb/storage/usb.c