updates

Conflicts:
	drivers/usb/gadget/htc_attr.c