]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e4788ed e22ce8e)
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 patch | diff1 | diff2 | blob | history
drivers/usb/typec/tcpm/tcpm.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm64/boot/dts/qcom/sc7280.dtsi
Simple merge
diff --cc drivers/usb/typec/tcpm/tcpm.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.