Merge remote-tracking branch 'usb/usb-next'

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

diff --cc drivers/usb/musb/musb_core.c
Simple merge

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

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

diff --cc include/linux/usb.h
Simple merge