git.maquefel.me Git - linux.git/commit

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7bab01e acb1872)

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 30 Jul 2018 08:04:58 +0000 (10:04 +0200)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 30 Jul 2018 08:04:58 +0000 (10:04 +0200)
commit	8a7b5d0f75f757fa88b0d17c19523161b27b8e80
tree	54a3e7f1f995583ed924ff32cf5dacc800119800	tree \| snapshot
parent	7bab01ecc6c43da882333c6db39741cb43677004	commit \| diff
parent	acb1872577b346bd15ab3a3f8dff780d6cca4b70	commit \| diff

Merge 4.18-rc7 into usb-next

We want the USB fixes in here as well to handle merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/usb/class/cdc-acm.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/hub.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/xhci.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/typec/tcpm.c	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git