Merge usb-linus branch into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 8 Feb 2013 20:03:11 +0000 (12:03 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 8 Feb 2013 20:03:11 +0000 (12:03 -0800)
commitceb675a9e25c0c11f76f8e72a862caf08d3934d3
tree6c79ad3468e7923f5da9f9ccd6678e0e4e3cd874
parent9662ced3527f5994e83957cf40765ed126abe97f
parent200e0d994d9d1919b28c87f1a5fb99a8e13b8a0f
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>
drivers/usb/core/hcd.c
drivers/usb/core/hub.c
drivers/usb/host/uhci-hub.c
drivers/usb/host/xhci-ring.c
drivers/usb/serial/option.c
drivers/usb/storage/usb.c