diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-20 18:57:15 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-20 18:57:15 +0200 |
| commit | ffa64d5e0d2f053d76ff9b1d2f437150b49c4112 (patch) | |
| tree | 08a400aeadf632bceae9613658dacb8ac6b275bc /include/uapi/linux | |
| parent | Linux v4.13-rc1 (diff) | |
| parent | cpufreq: intel_pstate: Correct the busy calculation for KNL (diff) | |
| parent | PM / Domains: defer dev_pm_domain_set() until genpd->attach_dev succeeds if present (diff) | |
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