diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-21 06:29:16 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-21 06:29:16 +0300 |
| commit | 3466b547e37b988723dc93465b7cb06b4b1f731f (patch) | |
| tree | d0a1c46b53ec24358a005ec071370b12f7ba20c2 /include/linux/apm-emulation.h | |
| parent | 9d0de5a63a4a22abfd2bd70694a610d18350cf87 (diff) | |
| parent | eeeb98bf06286380f74fc0d39df643c50fd056e5 (diff) | |
| parent | 70734a786acfd1998e47d40df19cba5c29469bdf (diff) | |
| parent | 67fadaa2768716209ee19a8b8bf05bc3ac399445 (diff) | |
| download | linux-3466b547e37b988723dc93465b7cb06b4b1f731f.tar.xz | |
Merge branches 'pnp', 'pm-cpuidle' and 'pm-cpufreq'
* pnp:
PNP: Switch from __check_region() to __request_region()
* pm-cpuidle:
cpuidle: powernv: Avoid endianness conversions while parsing DT
cpuidle: powernv: Read target_residency value of idle states from DT if available
* pm-cpufreq:
cpufreq: s3c: remove last use of resume_clocks callback
cpufreq: s3c: remove incorrect __init annotations