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>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/usb/core/hub.c
Simple merge

diff --cc drivers/usb/misc/idmouse.c
Simple merge

diff --cc drivers/usb/misc/lvstest.c
Simple merge

diff --cc drivers/usb/misc/uss720.c
Simple merge