Merge branches 'acpi-scan' and 'acpi-video'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 17 Jul 2014 23:15:17 +0000 (01:15 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 17 Jul 2014 23:15:17 +0000 (01:15 +0200)
commit11634bd6682d5979fa10fdc01cd74577827377bd
tree22e3a3e7439ba30b15498113d24017b89e58cd39
parent1d9dbf154295aa33819b08340464ff15495e83d8
parent4cf465b579c20bee868464f5d664f8d2d96cd370
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"