Merge branch 'pm-genirq' into acpi-pm