Merge 4.11-rc5 into usb-next

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/hcd.c
Simple merge

diff --cc drivers/usb/host/xhci-plat.c
Simple merge

diff --cc drivers/usb/host/xhci.c
Simple merge