From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 17 Jul 2014 23:15:17 +0000 (+0200)
Subject: Merge branches 'acpi-scan' and 'acpi-video'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=11634bd6682d5979fa10fdc01cd74577827377bd;p=linux-beck.git

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"
---

11634bd6682d5979fa10fdc01cd74577827377bd