Merge 5.0-rc6 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 21 Sep 2020 07:06:42 +0000 (09:06 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 21 Sep 2020 07:06:42 +0000 (09:06 +0200)
commit629b9111535f2a2607bbea1599d285a25f32835d
tree81a37df4e13842d5ea3d54b619e929e2b6e9ffed
parent673d74683627bc78eaca1fdbe24b6cf45c5c8d84
parentba4f184e126b751d1bffad5897f263108befc780
Merge 5.0-rc6 into usb-next

We want the USB fixes in here, and this resolves a merge issue in the
uas driver.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/usb/typec/mux/intel_pmc_mux.c