This resolves the merge problems with:
	drivers/usb/dwc3/gadget.c
	drivers/usb/musb/tusb6010.c
that had been seen in linux-next.
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>