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

Merge 8e56a792 ("ALSA: hda/realtek: enable headset mic on Latitude 5420...


Merge 8e56a792 ("ALSA: hda/realtek: enable headset mic on Latitude 5420 Rugged") into android13-5.10-lts

Steps on the way to 5.10.239

Resolves merge conflicts in:
	fs/nfsd/nfssvc.c

Change-Id: I89800b72fd2b7a1c6952f840e7d924727f433884
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents b1f396d3 8e56a792
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment