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>

diff --cc drivers/usb/core/hub.c
Simple merge

diff --cc drivers/usb/host/xhci-mem.c
Simple merge

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

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

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