]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
projects / users / dwmw2 / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 32fc9eb bc465aa)
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)
We want the USB fixes in here as well to resolve merge conflicts.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
drivers/usb/chipidea/udc.c patch | diff1 | diff2 | blob | history
drivers/usb/host/xhci-ring.c patch | diff1 | diff2 | blob | history

diff --cc drivers/usb/chipidea/udc.c
Simple merge
diff --cc drivers/usb/host/xhci-ring.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.