Merge branches 'pm-cpuidle', 'powercap', 'irq-pm' and 'acpi-resources'