diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-28 13:47:31 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-28 13:47:31 -0700 | 
| commit | dfca53fb166bc2a0a1ec36efedad30946e0b0652 (patch) | |
| tree | e352cfc5f6e082becacb01ea4cadd98584201c71 /drivers/gpu/drm/omapdrm/omap_encoder.c | |
| parent | 8b1e54c48f3298ac84cafca13ad65901117b43a9 (diff) | |
| parent | 6125c2be96b941a08e05516cfa1125ca53945bb2 (diff) | |
Merge tag 'pm+acpi-3.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI and power management fixes from Rafael J Wysocki:
 - Fix for a recent cpufreq regression related to acpi-cpufreq and
   suspend/resume from Viresh Kumar.
 - cpufreq stats reference counting fix from Viresh Kumar.
 - intel_pstate driver fixes from Dirk Brandewie and Konrad Rzeszutek
   Wilk.
 - New ACPI suspend blacklist entry for Sony Vaio VGN-FW21M from Fabio
   Valentini.
 - ACPI Platform Error Interface (APEI) fix from Chen Gong.
 - PCI root bridge hotplug locking fix from Yinghai Lu.
* tag 'pm+acpi-3.9-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PCI / ACPI: hold acpi_scan_lock during root bus hotplug
  ACPI / APEI: fix error status check condition for CPER
  ACPI / PM: fix suspend and resume on Sony Vaio VGN-FW21M
  cpufreq: acpi-cpufreq: Don't set policy->related_cpus from .init()
  cpufreq: stats: do cpufreq_cpu_put() corresponding to cpufreq_cpu_get()
  intel-pstate: Use #defines instead of hard-coded values.
  cpufreq / intel_pstate: Fix calculation of current frequency
  cpufreq / intel_pstate: Add function to check that all MSRs are valid
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_encoder.c')
0 files changed, 0 insertions, 0 deletions
