tree 22e3a3e7439ba30b15498113d24017b89e58cd39
parent 1d9dbf154295aa33819b08340464ff15495e83d8
parent 4cf465b579c20bee868464f5d664f8d2d96cd370
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1405638917 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1405638917 +0200

Merge branches 'acpi-scan' and 'acpi-video'

* acpi-scan:
  ACPI / documentation: Remove reference to acpi_platform_device_ids from enumeration.txt

* acpi-video:
  ACPI / video: Add use_native_backlight quirk for HP ProBook 4540s
  Revert "ACPI / video: change acpi-video brightness_switch_enabled default to 0"