projects / wrapfs-3.2.y.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2da050e a8750dd)
Merge 4.15-rc8 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 15 Jan 2018 14:00:11 +0000 (15:00 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 15 Jan 2018 14:00:11 +0000 (15:00 +0100)
We want the USB fixes in here as well for merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1  2 
drivers/usb/storage/unusual_uas.h patch | diff1 | diff2 | blob | history
drivers/usb/usbip/usbip_common.c patch | diff1 | diff2 | blob | history

diff --cc drivers/usb/storage/unusual_uas.h
Simple merge
diff --cc drivers/usb/usbip/usbip_common.c
Simple merge
wrapfs-3.2.y