We want the USB and other fixes in here as well to make merges and
testing easier.
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>