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

Skip to content
Commit 47bf31ad authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'dock' into test 



Conflicts:
	drivers/acpi/osl.c

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parents 4538fad5 0a918a94
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