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

diff --cc MAINTAINERS
Simple merge

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

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

diff --cc drivers/usb/gadget/function/f_mass_storage.c
Simple merge

diff --cc drivers/usb/gadget/function/f_rndis.c
Simple merge

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