From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 3 Oct 2014 01:10:07 +0000 (+0200)
Subject: Merge branches 'pm-cpufreq' and 'acpi-video'
X-Git-Tag: v3.17~8^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=abcadddc85a4c9595b0a5ede34f2ee876fe4155f;p=linux.git

Merge branches 'pm-cpufreq' and 'acpi-video'

* pm-cpufreq:
  cpufreq: update 'cpufreq_suspended' after stopping governors
  cpufreq: integrator: fix integrator_cpufreq_remove return type
  cpufreq: pcc-cpufreq: Fix wait_event() under spinlock

* acpi-video:
  ACPI / i915: Update the condition to ignore firmware backlight change request
---

abcadddc85a4c9595b0a5ede34f2ee876fe4155f