]> 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: 4eb44f6 9d3cce1)
Merge 4.18-rc5 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 Jul 2018 07:09:24 +0000 (09:09 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 Jul 2018 07:09:24 +0000 (09:09 +0200)
We need the USB fixes in here as well.

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

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