Skip to content

L
linux
Commit 762caf0b authored by Len Brown's avatar Len Brown
Browse files
Options

Merge branch 'ec' into release 

Conflicts:
	drivers/acpi/ec.c
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parents 3b87bb64 f25752e6
Expand all Show whitespace changes
Inline Side-by-side
Showing with 50 additions and 100 deletions
drivers/acpi/ec.c
View file @ 762caf0b
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7