Commit 370ab92a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge e67da288 ("Merge tag 'usb-6.2-rc5' of...

Merge e67da288 ("Merge tag 'usb-6.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb"

) into android-mainline

Steps on the way to 6.2-rc5

Resolves merge conflicts in:
	drivers/usb/gadget/configfs.c

Change-Id: Ib5c2e530b752088169565680a3b9d6d01b46bc07
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents fd92d1ad e67da288
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment