]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branches 'acpi-button' and 'acpi-dock'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 30 Oct 2020 15:31:20 +0000 (16:31 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 30 Oct 2020 15:31:20 +0000 (16:31 +0100)
* acpi-button:
  ACPI: button: Drop no longer necessary Acer SW5-012 lid_init_state quirk

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


Trivial merge