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)
commit88ea0f2c02f461613dd67664a79db525e9723609
tree55f814cf8dae53b6bee5fcd09de99757f091dcf1
parent82e180598b54873553fb1d285fb0c90fc54f8f23
parenteb8c68ef558e6cba241e7ada54f6b3427cb2bf68
parentba7abeb1bab10da64919d4ab890ddec71428cd04
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