Merge 5.5-rc6 into usb-next
commit845f081002eebd7a1216fc0a5ef2c862dc6d093e
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 13 Jan 2020 11:11:40 +0000 (13 12:11 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 13 Jan 2020 11:11:40 +0000 (13 12:11 +0100)
tree41f5ee3829836aafc4d872edf2c2e22390ae6034
parent585c91f40d201bc564d4e76b83c05b3b5363fe7e
parentb3a987b0264d3ddbb24293ebff10eddfc472f653
Merge 5.5-rc6 into usb-next

We need the USB fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/usb/cdns3/gadget.c
drivers/usb/typec/ucsi/ucsi.h