Merge branches 'pm-sleep' and 'pm-cpufreq'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 26 Jan 2017 23:08:59 +0000 (00:08 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 26 Jan 2017 23:08:59 +0000 (00:08 +0100)
commitff7e593c9cf3ccceaab7ac600cbd52cb9ff4c57a
tree84d721e253655d9f2b774ba95155201ff5c13dec
parent7a308bb3016f57e5be11a677d15b821536419d36
parente326ce013a8e851193eb337aafb1aa396c533a61
parent1443ebbacfd7f8d84fbbbf629ef66a12dc8a4b4e
Merge branches 'pm-sleep' and 'pm-cpufreq'

* pm-sleep:
  Revert "PM / sleep / ACPI: Use the ACPI_FADT_LOW_POWER_S0 flag"

* pm-cpufreq:
  cpufreq: intel_pstate: Fix sysfs limits enforcement for performance policy
drivers/acpi/sleep.c
drivers/cpufreq/intel_pstate.c