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

Skip to content
Commit 42de5532 authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'bugzilla-13931-sleep-nvs' into release 



Conflicts:
	drivers/acpi/sleep.c

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parents e9e8b4dd 2a6b6976
Hide 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