]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
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)
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>
1  2 
MAINTAINERS
drivers/usb/gadget/udc/core.c

diff --cc MAINTAINERS
Simple merge
Simple merge