Skip to content
Commit 762caf0b authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'ec' into release 



Conflicts:
	drivers/acpi/ec.c

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parents 3b87bb64 f25752e6
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