mirror of
https://github.com/torvalds/linux.git
synced 2026-05-06 23:35:26 -04:00
We want the USB fixes in here, and this resolves a merge issue found in linux-next. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>