Merge v5.11-rc5 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 25 Jan 2021 10:23:27 +0000 (11:23 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 25 Jan 2021 10:23:27 +0000 (11:23 +0100)
commit1d6a81519d9d27b99bca638d14eca63c31111afd
tree8063d42442b46bac5e3defa59de277fecc524ad6
parent386ce1d748edfdf57f21310647e2d42dd5f737f2
parent6ee1d745b7c9fd573fba142a2efdad76a9f1cb04
Merge v5.11-rc5 into usb-next

We need the fixes in here and this resolves a merge issue with
drivers/usb/gadget/udc/bdc/Kconfig.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/usb/gadget/udc/core.c