cleanup

Conflicts:

	drivers/usb/gadget/f_qdss.c