Merge branch 'ec' into release

diff --cc drivers/acpi/button.c
Simple merge

diff --cc drivers/acpi/ec.c
Simple merge

diff --cc drivers/acpi/events/evxfevnt.c
Simple merge

diff --cc drivers/acpi/system.c
Simple merge