Merge usb-linus branch into usb-next

This pulls in a bunch of fixes that are in Linus's tree because we need them
here for testing and development.

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

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

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

diff --cc drivers/usb/host/uhci-hub.c
Simple merge

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

diff --cc drivers/usb/serial/option.c
Simple merge

diff --cc drivers/usb/storage/usb.c
Simple merge