]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit180ab78bce3c000f07218c96d6fcc1763760a35d
tree2354d4c2f5185c59dc21c537841b55c694cc53ec
parent37ed74f587062116f55a0574d7572adcb3473ab2
parent3409255769c2683ef21d8fb2452cc5bbd994ca29
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