tree 5ca4fcac9a70bfe871a323a2c0a5ee9c6272fd9d
parent 36a8015f89e40f7c9c91cc7e6d028fa288dad27b
parent 024aa8732acb7d2503eae43c3fe3504d0a8646d0
parent 4d30d4a0441dac4452fcc188cd21536bedaec5df
parent cde10f856a7de191a773d880bb524ea15084e1cc
parent e1e047ace8cef6d143f38c7d769753f133becbe6
parent 2a0efc77735b48c42aedbe99df1f8f91aa402f57
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1575451217 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1575451217 +0100

Merge branches 'pm-sleep', 'pm-cpuidle', 'pm-cpufreq', 'pm-devfreq' and 'pm-avs'

* pm-sleep:
  ACPI: PM: s2idle: Rework ACPI events synchronization
  ACPI: EC: Rework flushing of pending work

* pm-cpuidle:
  cpuidle: minor Kconfig help text fixes
  cpuidle: Drop disabled field from struct cpuidle_state
  cpuidle: Fix Kconfig indentation

* pm-cpufreq:
  cpufreq: Fix Kconfig indentation

* pm-devfreq:
  PM / devfreq: Add missing locking while setting suspend_freq

* pm-avs:
  power: avs: Fix Kconfig indentation