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

Merge 5d5385fe ("regulator: sy7636a: fix lifecycle of power good gpio") into android13-5.4-lts 



Steps on the way to 5.15.194

Resolves merge conflicts in:
	include/net/sock.h
	net/core/sock.c

Change-Id: I24e7232dd693909e3290b8b14377eec00e1b1f52
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 2bbc2937 5d5385fe
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