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

diff --cc drivers/usb/core/hcd-pci.c
Simple merge

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

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

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

diff --cc drivers/usb/host/xhci.h
Simple merge

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