diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-26 23:20:16 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-26 23:20:16 +0200 |
| commit | 9b961aa99b8155ecc07dd727643ca97424544256 (patch) | |
| tree | 729c46c920bf490a851afff0b65149f962518156 | |
| parent | c7208164e66f63e3ec1759b98087849286410741 (diff) | |
| parent | e3beb0ac521d50d158a9d253373eae8421ac3998 (diff) | |
| parent | 2807bd18cc60ec471917b5158e98e4d7b7e030fb (diff) | |
| download | linux-9b961aa99b8155ecc07dd727643ca97424544256.tar.gz linux-9b961aa99b8155ecc07dd727643ca97424544256.tar.bz2 linux-9b961aa99b8155ecc07dd727643ca97424544256.zip | |
Merge branches 'pm-cpufreq' and 'acpi-thermal'
* pm-cpufreq:
cpufreq: cpu0: drop wrong devm usage
cpufreq: remove race while accessing cur_policy
* acpi-thermal:
ACPI / thermal: fix workqueue destroy order