Merge 4.10-rc7 into usb-next

author Greg Kroah-Hartman <[email protected]>

Mon, 6 Feb 2017 08:32:06 +0000 (09:32 +0100)

committer Greg Kroah-Hartman <[email protected]>

Mon, 6 Feb 2017 08:32:06 +0000 (09:32 +0100)
author Greg Kroah-Hartman <[email protected]>
Mon, 6 Feb 2017 08:32:06 +0000 (09:32 +0100)
committer Greg Kroah-Hartman <[email protected]>
Mon, 6 Feb 2017 08:32:06 +0000 (09:32 +0100)
diff --cc drivers/usb/gadget/function/f_fs.c
Simple merge
diff --cc drivers/usb/musb/musb_core.c
Simple merge
diff --cc drivers/usb/musb/musb_core.h
Simple merge
author	Greg Kroah-Hartman <[email protected]>
	Mon, 6 Feb 2017 08:32:06 +0000 (09:32 +0100)
committer	Greg Kroah-Hartman <[email protected]>
	Mon, 6 Feb 2017 08:32:06 +0000 (09:32 +0100)
		1	2
drivers/usb/gadget/function/f_fs.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/usb/musb/musb_core.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/usb/musb/musb_core.h	patch \|	diff1 \|	diff2 \|	blob \| history