tree 55f814cf8dae53b6bee5fcd09de99757f091dcf1
parent 82e180598b54873553fb1d285fb0c90fc54f8f23
parent eb8c68ef558e6cba241e7ada54f6b3427cb2bf68
parent ba7abeb1bab10da64919d4ab890ddec71428cd04
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1390992503 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1390992503 +0100

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