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

Merge 2f420df7 ("drm/sti: remove duplicate object names") into android13-5.15-lts



Steps on the way to 5.15.181

Resolves merge conflicts in:
	fs/nfsd/nfs4state.c
	kernel/sched/cpufreq_schedutil.c

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