summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-01-08 14:11:03 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-01-08 14:11:03 -0800
commit74e59ea05c790c3f2108fa20dd4bacc028c4badf (patch)
tree9d7ff073dfdb52ed28196e6eebe67abf80186c57 /Makefile
parent086b2a942e794a03e5ea7503f45f2353559b5a3e (diff)
parent794c3a0a9380d46cebff14b0d9b409ecb7687480 (diff)
downloadlinux-74e59ea05c790c3f2108fa20dd4bacc028c4badf.tar.bz2
Merge tag 'pm+acpi-3.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management and ACPI fixes from Rafael Wysocki: "These are an ACPI device power management initialization fix (-stable material), two commits renaming stuff in the ACPI processor driver to make it more suitable for ARM64 processors and a new ACPI backlight blacklist entry. Specifics: - Fix ACPI power management intialization for device objects corresponding to devices that are not present at the init time (the _STA control method returns 0 for them) and therefore should not be regarded as power manageable (Rafael J Wysocki). - Rename a structure field and two functions used by the ACPI processor driver to make them less tied to architectures that use APICs (both x86 and ia64) and more suitable for ARM64 processors (Hanjun Guo). - Add a disable_native_backlight quirk for Dell XPS15 L521X designed in an unusual way preventing native backlight from working on that machine (Hans de Goede)" * tag 'pm+acpi-3.19-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI / video: Add disable_native_backlight quirk for Dell XPS15 L521X ACPI / processor: Rename acpi_(un)map_lsapic() to acpi_(un)map_cpu() ACPI / processor: Convert apic_id to phys_id to make it arch agnostic ACPI / PM: Fix PM initialization for devices that are not present
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions