summary refs log tree commit diff
path: root/drivers/base
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-07-03 14:22:34 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2017-07-03 14:22:34 +0200
commit9a5f2c871af4cf6bd63ddb20061faa7049103350 (patch)
tree910f44e915f022500a1c0aba686780c4666463ce /drivers/base
parentfb0356c4786ea97e5abdf06c98a29dd675187bd0 (diff)
parent268cd2ed3d4413a963d765eb6c0b87f06932b971 (diff)
parent1a99d0c7962364d5fba5e0cfe5ced586e133f31a (diff)
parentedbdabc62328ec0ac98d83ca384bf9fd5251ade6 (diff)
downloadlinux-9a5f2c871af4cf6bd63ddb20061faa7049103350.tar.gz
Merge branches 'pm-domains', 'pm-avs' and 'powercap'
* pm-domains:
  PM / Domains: Fix missing default_power_down_ok comment
  PM / Domains: Fix unsafe iteration over modified list of domains
  PM / Domains: Fix unsafe iteration over modified list of domain providers
  PM / Domains: Fix unsafe iteration over modified list of device links
  PM / Domains: Handle safely genpd_syscore_switch() call on non-genpd device
  PM / Domains: Call driver's noirq callbacks
  PM / Domains: Constify genpd pointer
  PM / Domains: pdd->dev can't be NULL in genpd_dev_pm_qos_notifier()

* pm-avs:
  PM / AVS: rockchip-io: add io selectors and supplies for rk3228

* powercap:
  powercap/RAPL: prevent overridding bits outside of the mask