From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 30 Oct 2020 15:31:20 +0000 (+0100)
Subject: Merge branches 'acpi-button' and 'acpi-dock'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8f7304bb9113c95b256d3aa79a884b4c60a806e1;p=linux.git

Merge branches 'acpi-button' and 'acpi-dock'

* acpi-button:
  ACPI: button: Drop no longer necessary Acer SW5-012 lid_init_state quirk

* acpi-dock:
  ACPI: dock: fix enum-conversion warning
---

8f7304bb9113c95b256d3aa79a884b4c60a806e1