We want the bug fixes and this resolves the merge issues with the usbip
driver.
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>