git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a4a00f6 6da6c0d)

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 30 Apr 2018 11:58:51 +0000 (04:58 -0700)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 30 Apr 2018 11:58:51 +0000 (04:58 -0700)
commit	890fa45d01eb89304ef26564cc310747f56b5438
tree	b07a2fd166cb26b3ff0a8a4b275e77c296af4557	tree \| snapshot
parent	a4a00f6b9dc0e3ea13145f53ce163821eb1a6fa0	commit \| diff
parent	6da6c0db5316275015e8cc2959f12a17584aeb64	commit \| diff

Merge 4.17-rc3 into usb-next

This resolves the merge issue with drivers/usb/core/hcd.c

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/hcd.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/hub.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree