]> Pileus Git - ~andy/linux/commitdiff
Merge branches 'pm-cpufreq' and 'pm-devfreq'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 29 Jan 2014 10:48:23 +0000 (11:48 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 29 Jan 2014 10:48:23 +0000 (11:48 +0100)
* pm-cpufreq:
  acpi-cpufreq: De-register CPU notifier and free struct msr on error.

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


Trivial merge