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

Merge 6.1.126 into android14-6.1-lts 



Changes in 6.1.126
	Partial revert of xhci: use pm_ptr() instead #ifdef for CONFIG_PM conditionals
	Linux 6.1.126

Change-Id: Ia60a9885b92b37ee891dfec18dd95be6dd6a1b23
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 3ad3cca3 f4f67728
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