summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-10-02 18:47:28 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-02 18:47:28 -0700
commit58586869599f6bb38aeca71a847cd77bfea74808 (patch)
treeb8c0539daa5ffaf91981da16a9451ee9aae9a5c4 /arch
parentf929d3995d61ee0ff5d35e9f3fbef3b80bf4ccaa (diff)
parentabcadddc85a4c9595b0a5ede34f2ee876fe4155f (diff)
downloadlinux-58586869599f6bb38aeca71a847cd77bfea74808.tar.gz
Merge tag 'pm+acpi-3.17-final' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI and power management fixes from Rafael Wysocki: "These are three regression fixes (cpufreq core, pcc-cpufreq, i915 / ACPI) and one trivial fix for a callback return value mismatch in the cpufreq integrator driver. Specifics: - A recent cpufreq core fix went too far and introduced a regression in the system suspend code path. Fix from Viresh Kumar. - An ACPI-related commit in the i915 driver that fixed backlight problems for some Thinkpads inadvertently broke a Dell machine (in 3.16). Fix from Aaron Lu. - The pcc-cpufreq driver was broken during the 3.15 cycle by a commit that put wait_event() under a spinlock by mistake. Fix that (Rafael J Wysocki). - The return value type of integrator_cpufreq_remove() is void, but should be int. Fix from Arnd Bergmann" * tag 'pm+acpi-3.17-final' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: cpufreq: update 'cpufreq_suspended' after stopping governors ACPI / i915: Update the condition to ignore firmware backlight change request cpufreq: integrator: fix integrator_cpufreq_remove return type cpufreq: pcc-cpufreq: Fix wait_event() under spinlock
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions