| commit | abcadddc85a4c9595b0a5ede34f2ee876fe4155f | |
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | |
| Fri, 3 Oct 2014 01:10:07 +0000 (3 03:10 +0200) | ||
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | |
| Fri, 3 Oct 2014 01:10:07 +0000 (3 03:10 +0200) | ||
| tree | 54ed7662055bab9c5b225bb40f64e2ff4c36c720 | treesnapshot (tar.gz zip) |
| parent | fe82dcec644244676d55a1384c958d5f67979adb | commitdiff |
| parent | b1b12babe3b72cfb08b875245e5a5d7c2747c772 | commitdiff |
| parent | 77076c7aac0184cae2d8a358cf6e6ed1f195fe3f | commitdiff |
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
* 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