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

Merge c6e0de1e ("drivers/nvme: Add quirks for device 126f:2262") into android13-5.10-lts 



Steps on the way to 5.10.215

Resolves conflicts in:
	drivers/base/core.c

Change-Id: Ie28a1200ef258bd33d3da93f43335653fbf4723b
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents f8c3f9c6 c6e0de1e
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