From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 6 Jan 2015 22:35:43 +0000 (+0100)
Subject: Merge branches 'acpi-pm', 'acpi-processor' and 'acpi-video'
X-Git-Tag: v3.19-rc4~22^2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=794c3a0a9380d46cebff14b0d9b409ecb7687480;p=~emulex%2Finfiniband.git

Merge branches 'acpi-pm', 'acpi-processor' and 'acpi-video'

* acpi-pm:
  ACPI / PM: Fix PM initialization for devices that are not present

* acpi-processor:
  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-video:
  ACPI / video: Add disable_native_backlight quirk for Dell XPS15 L521X
---

794c3a0a9380d46cebff14b0d9b409ecb7687480