Merge branch 'pm-clk' into acpi-lpss