summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-10-03 03:10:07 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-10-03 03:10:07 +0200
commitabcadddc85a4c9595b0a5ede34f2ee876fe4155f (patch)
tree54ed7662055bab9c5b225bb40f64e2ff4c36c720
parentfe82dcec644244676d55a1384c958d5f67979adb (diff)
parentb1b12babe3b72cfb08b875245e5a5d7c2747c772 (diff)
parent77076c7aac0184cae2d8a358cf6e6ed1f195fe3f (diff)
downloadlinux-abcadddc85a4c9595b0a5ede34f2ee876fe4155f.tar.gz
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