Merge branches 'intel_pstate' and 'pm-domains'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 20 Jul 2017 16:57:15 +0000 (18:57 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 20 Jul 2017 16:57:15 +0000 (18:57 +0200)
commitffa64d5e0d2f053d76ff9b1d2f437150b49c4112
tree08a400aeadf632bceae9613658dacb8ac6b275bc
parent5771a8c08880cdca3bfb4a3fc6d309d6bba20877
parent6e34e1f23d780978da65968327cbba6d7013a73f
parent975e83cfb8dc16e7a2fdc58188c77c0c605876c2
Merge branches 'intel_pstate' and 'pm-domains'

* intel_pstate:
  cpufreq: intel_pstate: Correct the busy calculation for KNL

* pm-domains:
  PM / Domains: defer dev_pm_domain_set() until genpd->attach_dev succeeds if present
drivers/base/power/domain.c
drivers/cpufreq/intel_pstate.c