Merge branches 'acpica', 'acpi-battery' and 'pm-cpuidle'