projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3df613e 30a7acd)
Merge 4.15.0-rc6 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 2 Jan 2018 14:13:41 +0000 (15:13 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 2 Jan 2018 14:13:41 +0000 (15:13 +0100)
We want the USB fixes in here, and this resolves a merge issue with the
vhci_rx.c file.

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

diff --cc drivers/usb/host/xhci-pci.c
Simple merge
diff --cc drivers/usb/host/xhci.c
Simple merge
diff --cc drivers/usb/usbip/stub_rx.c
Simple merge
ep93xx device tree rework repo: git://git.maquefel.me/linux.git