Merge branches 'acpi-apei', 'acpi-x86', 'acpi-battery' and 'acpi-pfrut'