Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge 5.4.77 into android11-5.4-lts 



Changes in 5.4.77
	powercap: restrict energy meter to root access
	Linux 5.4.77

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I4076b4f375f8227386f0a61117f5a5ed81ea23e1
parents 0e161a13 2544d06a
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment