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

Merge b5dc5b7d ("cxl/port: Fix cxl_bus_rescan() vs bus_rescan_devices()")... 


Merge b5dc5b7d ("cxl/port: Fix cxl_bus_rescan() vs bus_rescan_devices()") into android14-6.1-lts

Steps on the way to 6.1.116

Resolves merge conflicts in:
	net/wireless/core.c

Change-Id: Ia10a58f63842e7bbc9440d960071985de9a399b8
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 0df5dc7d b5dc5b7d
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