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

Merge 89262014 ("x86/mm: Switch to new Intel CPU model defines") into android13-5.10-lts 



Steps on the way to 5.10.227

Resolves merge conflicts in:
	fs/f2fs/xattr.c
	fs/nfsd/filecache.c

Change-Id: I4c997736f69b06f8e3c74dfe0600d82403cdf317
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 139a6bb2 89262014
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