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

Conflicts:
	drivers/usb/phy/phy-mv-u3d-usb.c

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

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

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

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

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

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

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

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

diff --cc drivers/usb/phy/Kconfig
Simple merge