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

Conflicts:
	drivers/phy/Makefile
	drivers/usb/musb/musb_core.c