aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-01-29 11:48:23 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-01-29 11:48:23 +0100
commit88ea0f2c02f461613dd67664a79db525e9723609 (patch)
tree55f814cf8dae53b6bee5fcd09de99757f091dcf1
parent82e180598b54873553fb1d285fb0c90fc54f8f23 (diff)
parenteb8c68ef558e6cba241e7ada54f6b3427cb2bf68 (diff)
parentba7abeb1bab10da64919d4ab890ddec71428cd04 (diff)
downloadlinux-linaro-stable-88ea0f2c02f461613dd67664a79db525e9723609.tar.gz
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