tree 08a400aeadf632bceae9613658dacb8ac6b275bc
parent 5771a8c08880cdca3bfb4a3fc6d309d6bba20877
parent 6e34e1f23d780978da65968327cbba6d7013a73f
parent 975e83cfb8dc16e7a2fdc58188c77c0c605876c2
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1500569835 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1500569835 +0200

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