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

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2e58caf c02ed2e)

author	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 27 Mar 2017 07:19:32 +0000 (09:19 +0200)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Mon, 27 Mar 2017 07:19:32 +0000 (09:19 +0200)
commit	e47ff590cc57a3468c1f77e5f2494bbaefdd4371
tree	7c71b3832c0d805b0ee6daa1aaaa50326b65654f	tree \| snapshot
parent	2e58cafa0bbde529a9f44300382f60f6ce46d7d2	commit \| diff
parent	c02ed2e75ef4c74e41e421acb4ef1494671585e8	commit \| diff

Merge 4.11-rc4 into usb-next

This resolves a merge issue in the gadget code, and we want the USB
fixes in here as well.

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

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/usb/core/hub.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/misc/idmouse.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/misc/lvstest.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/misc/uss720.c	diff1 \|	diff2 \|	blob \| history

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