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

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



Steps on the way to 5.15.194

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

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