Merge 4.17-rc6 into usb-next
commitc049ffb35ac4a393919a001f8f468c43cb185a34
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 21 May 2018 06:27:15 +0000 (21 08:27 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 21 May 2018 06:27:15 +0000 (21 08:27 +0200)
tree3d8835848724bebf6326aaed3ae5e4dd8d302057
parentbaf12d6ddeae74dfcfd5d19fce86260a2e1e44f2
parent771c577c23bac90597c685971d7297ea00f99d11
Merge 4.17-rc6 into usb-next

We want the bug fixes and this resolves the merge issues with the usbip
driver.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS