Merge 5.14-rc7 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Aug 2021 13:21:10 +0000 (15:21 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Aug 2021 13:21:10 +0000 (15:21 +0200)
We need the USB fix in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
arch/arm64/boot/dts/qcom/sc7280.dtsi
drivers/usb/typec/tcpm/tcpm.c

Simple merge
Simple merge