Commit c6490faa authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 93a56dbe ("drivers/card_reader/rtsx_usb: Restore interrupt based... 


Merge 93a56dbe ("drivers/card_reader/rtsx_usb: Restore interrupt based detection") into android14-6.1-lts

Steps on the way to 6.1.129

Resolves merge conflicts in:
	drivers/usb/host/xhci-ring.c

Change-Id: Ie123285eab89802392003b95ec495b21820ad41b
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 9fb90380 93a56dbe
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment