]> 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)
commit22e3683e01130103b9a1bd30fb78b4e948d0e19d
tree2354d4c2f5185c59dc21c537841b55c694cc53ec
parent03aa550c3e906632673f019ecca9c93dca4e5639
parent975c89e4da24c0f77ce71944d00208b9186fb10d
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