Skip to content
Commit 751516f0 authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'ec-cleanup' into release 

Conflicts:
	drivers/platform/x86/compal-laptop.c
parents 6288cf1e 08b53f0e
Hide whitespace changes
Inline Side-by-side
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