diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-21 04:29:16 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-02-21 04:29:16 +0100 |
commit | 3466b547e37b988723dc93465b7cb06b4b1f731f (patch) | |
tree | d0a1c46b53ec24358a005ec071370b12f7ba20c2 | |
parent | Merge branches 'acpi-ec', 'acpi-soc', 'acpi-video' and 'acpi-resources' (diff) | |
parent | PNP: Switch from __check_region() to __request_region() (diff) | |
parent | cpuidle: powernv: Avoid endianness conversions while parsing DT (diff) | |
parent | cpufreq: s3c: remove last use of resume_clocks callback (diff) | |
download | linux-3466b547e37b988723dc93465b7cb06b4b1f731f.tar.xz linux-3466b547e37b988723dc93465b7cb06b4b1f731f.zip |
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