Merge 4.0-rc5 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 23 Mar 2015 20:49:37 +0000 (21:49 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 23 Mar 2015 20:49:37 +0000 (21:49 +0100)
commitcd0e075784f4bce97b4ed47d4b354f045e895546
tree2354d4c2f5185c59dc21c537841b55c694cc53ec
parent32fc9eb5b2dcebefb7fb4c8288c739c320362524
parentbc465aa9d045feb0e13b4a8f32cc33c1943f62d6
Merge 4.0-rc5 into usb-next

We want the USB fixes in here as well to resolve merge conflicts.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/chipidea/udc.c
drivers/usb/host/xhci-ring.c