summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-05-06 10:54:43 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2019-05-06 10:54:43 +0200
commit78baa1ea5880f2d336d2ad92724988584d2f471d (patch)
tree06b4b6b838759165dd12d18a3045f567fd93233f /drivers/base
parent7d4a27c1c861f9116b7acf427e3fe3260287b876 (diff)
parente94999688e3aa3c0a8ad5a60352cdc3ca3030434 (diff)
parentdc351d4c5f4fe4d0f274d6d660227be0c3a03317 (diff)
downloadlinux-78baa1ea5880f2d336d2ad92724988584d2f471d.tar.gz
linux-78baa1ea5880f2d336d2ad92724988584d2f471d.tar.bz2
linux-78baa1ea5880f2d336d2ad92724988584d2f471d.zip
Merge branches 'pm-cpuidle' and 'pm-sleep'
* pm-cpuidle: PM / Domains: Add genpd governor for CPUs cpuidle: Export the next timer expiration for CPUs PM / Domains: Add support for CPU devices to genpd PM / Domains: Add generic data pointer to struct genpd_power_state cpuidle: exynos: Unify target residency for AFTR and coupled AFTR states * pm-sleep: PM / core: Propagate dev->power.wakeup_path when no callbacks PM / core: Introduce dpm_async_fn() helper PM / core: fix kerneldoc comment for device_pm_wait_for_dev() PM / core: fix kerneldoc comment for dpm_watchdog_handler() PM / sleep: Measure the time of filesystems syncing PM / sleep: Refactor filesystems sync to reduce duplication PM / wakeup: Use pm_pr_dbg() instead of pr_debug()