]> 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: 5821bf2 6ba59ff)
Merge tag 'v6.10-rc4' into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 18 Jun 2024 09:06:17 +0000 (11:06 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 18 Jun 2024 09:06:17 +0000 (11:06 +0200)
We need the USB / Thunderbolt fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
drivers/usb/typec/tcpm/tcpm.c patch | diff1 | diff2 | blob | history
drivers/usb/typec/ucsi/ucsi.c patch | diff1 | diff2 | blob | history

diff --cc drivers/usb/typec/tcpm/tcpm.c
Simple merge
diff --cc drivers/usb/typec/ucsi/ucsi.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.