mirror of
https://github.com/torvalds/linux.git
synced 2025-04-09 14:45:27 +00:00

We need the USB fixes in here, and this resolves a merge conflict with the i915 driver as reported in linux-next Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>