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

Merge 34cac2d2 ("regulator: sy7636a: fix lifecycle of power good gpio") into android14-6.1-lts 



Steps on the way to 6.1.153

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

Change-Id: I82e878f0fbeb3f7340e91719ded1b919cf4179b9
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 91023479 34cac2d2
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