We want the USB fixes in here to resolve merge issues and make it easier
for testing.
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>