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

Merge cb7bea98 ("net: axienet: Set mac_managed_pm") into android14-6.1-lts 



Steps on the way to 6.1.130

Resolves merge conflicts in:
	drivers/net/gtp.c
	drivers/usb/gadget/udc/core.c

Change-Id: I1fe09ecb3c00f1374305ba58a46924194ccb1761
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 208e9672 cb7bea98
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