diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-29 11:48:23 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-01-29 11:48:23 +0100 |
| commit | 88ea0f2c02f461613dd67664a79db525e9723609 (patch) | |
| tree | 55f814cf8dae53b6bee5fcd09de99757f091dcf1 /scripts/kernel-doc | |
| parent | Merge branches 'acpi-processor', 'acpi-hotplug', 'acpi-init', 'acpi-pm' and '... (diff) | |
| parent | acpi-cpufreq: De-register CPU notifier and free struct msr on error. (diff) | |
| parent | PM / devfreq: Disable Exynos4 driver build on multiplatform (diff) | |
| download | linux-88ea0f2c02f461613dd67664a79db525e9723609.tar.gz linux-88ea0f2c02f461613dd67664a79db525e9723609.zip | |
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