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

Browse source

* 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

...

This commit is contained in:

Rafael J. Wysocki 2015-07-29 15:19:39 +02:00

parent 559ed40752 71b65445f0

commit d29809b8eb

1 changed files with 1 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

drivers/acpi/device_pm.c

View file