]> asedeno.scripts.mit.edu Git - linux.git/commit
Merge 4.11-rc4 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Mar 2017 07:19:32 +0000 (09:19 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Mar 2017 07:19:32 +0000 (09:19 +0200)
commite47ff590cc57a3468c1f77e5f2494bbaefdd4371
tree7c71b3832c0d805b0ee6daa1aaaa50326b65654f
parent2e58cafa0bbde529a9f44300382f60f6ce46d7d2
parentc02ed2e75ef4c74e41e421acb4ef1494671585e8
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
drivers/usb/core/hub.c
drivers/usb/misc/idmouse.c
drivers/usb/misc/lvstest.c
drivers/usb/misc/uss720.c