aboutsummaryrefslogtreecommitdiffstats
path: root/arch/alpha/include/asm/linkage.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-07-26 17:37:18 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-07-26 17:37:18 -0400
commit0f746650258187664a7afa1f708618f6599f6d76 (patch)
tree0c34864acddcc9196e17bdef38ddf01b4278144d /arch/alpha/include/asm/linkage.h
parenta9b5f023947a67d430a4db61a1e2bc7fc258aa72 (diff)
parent8e5c2b776ae4c35f54547c017e0a943429f5748a (diff)
Merge tag 'pm+acpi-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI and power management fixes from Rafael Wysocki: "These are just two fixes, a revert of the would-be backlight fix that didn't work and an intel_pstate fix for two problems related to maximum P-state selection. Specifics: - Revert of the ACPI video commit that I hoped would help fix backlight problems related to Windows 8 compatibility on some systems. Unfortunately, it turned out to cause problems to happen too. - Fix for two problems in intel_pstate, a possible failure to respond to a load change on a quiet system and a possible failure to select the highest available P-state on some systems. From Dirk Brandewie" * tag 'pm+acpi-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: Revert "ACPI / video / i915: No ACPI backlight if firmware expects Windows 8" cpufreq / intel_pstate: Change to scale off of max P-state
Diffstat (limited to 'arch/alpha/include/asm/linkage.h')
0 files changed, 0 insertions, 0 deletions