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

diff --cc drivers/base/core.c
Simple merge

diff --cc drivers/pci/probe.c
Simple merge

diff --cc drivers/usb/cdns3/cdns3-gadget.c
Simple merge

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

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