We need the USB fixes in here as well to handle future merge issues and
dependancies.
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>