From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 22 Sep 2017 20:45:54 +0000 (+0200)
Subject: Merge branches 'pm-cpufreq' and 'pm-cpuidle'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d84c97f8f77bc4124256e76864f125f45ad53744;p=linux.git

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
---

d84c97f8f77bc4124256e76864f125f45ad53744