Merge branches 'acpica-fixes' and 'acpi-ec-fixes'