summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-10-30 16:31:20 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-10-30 16:31:20 +0100
commit8f7304bb9113c95b256d3aa79a884b4c60a806e1 (patch)
tree20496a6ed013d75fea2a18a2bf63a784cf2a2576 /drivers
parent85f971b65a692b68181438e099b946cc06ed499b (diff)
parent136a4dfe87cd34db2153330aa84dbbc210eb36b6 (diff)
parentbe0e97526455fefe3b7668b7fdf6cd247bf13318 (diff)
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