tree 54ed7662055bab9c5b225bb40f64e2ff4c36c720
parent fe82dcec644244676d55a1384c958d5f67979adb
parent b1b12babe3b72cfb08b875245e5a5d7c2747c772
parent 77076c7aac0184cae2d8a358cf6e6ed1f195fe3f
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1412298607 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1412298607 +0200

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