diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-29 14:48:23 +0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-29 14:48:23 +0400 |
| commit | 88ea0f2c02f461613dd67664a79db525e9723609 (patch) | |
| tree | 55f814cf8dae53b6bee5fcd09de99757f091dcf1 /net/hsr | |
| parent | 82e180598b54873553fb1d285fb0c90fc54f8f23 (diff) | |
| parent | eb8c68ef558e6cba241e7ada54f6b3427cb2bf68 (diff) | |
| parent | ba7abeb1bab10da64919d4ab890ddec71428cd04 (diff) | |
| download | linux-88ea0f2c02f461613dd67664a79db525e9723609.tar.xz | |
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