Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 6ed962a2 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3.1-rc4 into usb-next 



This was done to resolve a conflict in this file:
	drivers/usb/host/xhci-ring.c

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parents c6a389f1 55a46269
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment