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

Merge 11da2b1a ("energy_model: Use a fixed reference frequency") into android15-6.6-lts



Steps on the way to 6.6.103

Resolves merge conflicts in:
	include/linux/energy_model.h
by mergeing away this individual commit as it does not apply at all
anymore to the Android tree due to other backports in this same area.

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