Merge branches 'pm-cpufreq' and 'acpi-pm'

* pm-cpufreq:
  cpufreq: Avoid attempts to create duplicate symbolic links
  intel_pstate: Add get_scaling cpu_defaults param to Knights Landing

* acpi-pm:
  ACPI / PM: Use target_state to set the device power state

parents 559ed407 71b65445

drivers/acpi/device_pm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -231,7 +231,7 @@ int acpi_device_set_power(struct acpi_device *device, int state)
		dev_warn(&device->dev, "Failed to change power state to %s\n",
		acpi_power_state_string(state));
		} else {
		device->power.state = state;
		device->power.state = target_state;
		ACPI_DEBUG_PRINT((ACPI_DB_INFO,
		"Device [%s] transitioned to %s\n",
		device->pnp.bus_id,