Merge branches 'acpi-resources', 'acpi-battery', 'acpi-doc' and 'acpi-pnp'