diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-09-22 22:45:54 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-09-22 22:45:54 +0200 |
commit | d84c97f8f77bc4124256e76864f125f45ad53744 (patch) | |
tree | c9bfb916a01c6142c01330acda3263ad439a756b /drivers | |
parent | 1419d033170e4c21e0722306b1c9fdc6794f309c (diff) | |
parent | 039cc1c1eb971ffe1973fddb8769a80fd4950a6f (diff) | |
parent | ed40fad9a568efe83f5e80897ded71117b6911b3 (diff) |
Merge branches 'pm-cpufreq' and 'pm-cpuidle'
* pm-cpufreq:
cpufreq: ti-cpufreq: Support additional am43xx platforms
cpufreq: dt-platdev: Add some missing platforms to the blacklist
* pm-cpuidle:
ARM: cpuidle: Avoid memleak if init fail