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

Merge a83ffafd ("drm/amd/pm: fix null pointer access") into android16-6.12-lts 



Steps on the way to 6.12.43

Resolves merge conflicts in:
	arch/arm64/mm/fault.c

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