summaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-12-04 10:20:17 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-12-04 10:20:17 +0100
commit1e4230f56dac141eb149ebec01f41b6fad27e503 (patch)
tree5ca4fcac9a70bfe871a323a2c0a5ee9c6272fd9d /arch/sh
parent36a8015f89e40f7c9c91cc7e6d028fa288dad27b (diff)
parent024aa8732acb7d2503eae43c3fe3504d0a8646d0 (diff)
parent4d30d4a0441dac4452fcc188cd21536bedaec5df (diff)
parentcde10f856a7de191a773d880bb524ea15084e1cc (diff)
parente1e047ace8cef6d143f38c7d769753f133becbe6 (diff)
parent2a0efc77735b48c42aedbe99df1f8f91aa402f57 (diff)
downloadlinux-1e4230f56dac141eb149ebec01f41b6fad27e503.tar.gz
linux-1e4230f56dac141eb149ebec01f41b6fad27e503.tar.bz2
linux-1e4230f56dac141eb149ebec01f41b6fad27e503.zip
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