Pull trivial into test branch

Conflicts:

	drivers/acpi/ec.c