]> git.baikalelectronics.ru Git - kernel.git/commitdiff
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)
* 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"


Trivial merge