Merge branches 'pm-cpufreq' and 'pm-cpuidle'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 22 Sep 2017 20:45:54 +0000 (22:45 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 22 Sep 2017 20:45:54 +0000 (22:45 +0200)
commitd84c97f8f77bc4124256e76864f125f45ad53744
treec9bfb916a01c6142c01330acda3263ad439a756b
parent1419d033170e4c21e0722306b1c9fdc6794f309c
parent039cc1c1eb971ffe1973fddb8769a80fd4950a6f
parented40fad9a568efe83f5e80897ded71117b6911b3
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