From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Wed, 29 Jan 2014 10:48:23 +0000 (+0100)
Subject: Merge branches 'pm-cpufreq' and 'pm-devfreq'
X-Git-Tag: firefly_0821_release~176^2~4497^2
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=88ea0f2c02f461613dd67664a79db525e9723609;p=firefly-linux-kernel-4.4.55.git

Merge branches 'pm-cpufreq' and 'pm-devfreq'

* pm-cpufreq:
  acpi-cpufreq: De-register CPU notifier and free struct msr on error.

* pm-devfreq:
  PM / devfreq: Disable Exynos4 driver build on multiplatform
---

88ea0f2c02f461613dd67664a79db525e9723609