tree c8f8304fb05926777defdc4607c95f91d340d6a3
parent 0a733e6effb4a429551d8b000aa02750cc7e04ba
parent 6cdcdb793791f776ea9408581b1242b636d43b37
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1378905795 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1378905795 +0200

Merge branch 'pm-cpufreq'

* pm-cpufreq:
  intel_pstate: Add Haswell CPU models
  Revert "cpufreq: make sure frequency transitions are serialized"
  cpufreq: Use signed type for 'ret' variable, to store negative error values
  cpufreq: Remove temporary fix for race between CPU hotplug and sysfs-writes
  cpufreq: Synchronize the cpufreq store_*() routines with CPU hotplug
  cpufreq: Invoke __cpufreq_remove_dev_finish() after releasing cpu_hotplug.lock
  cpufreq: Split __cpufreq_remove_dev() into two parts
  cpufreq: Fix wrong time unit conversion
  cpufreq: serialize calls to __cpufreq_governor()
  cpufreq: don't allow governor limits to be changed when it is disabled