summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-11-12 16:11:48 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-11-12 16:11:48 +0100
commit7222a8a52c9ec59affc4d6c4e2632b3e4a44cd27 (patch)
tree021a7f169f454cb0f5cef7bcaeb7ab55b570b3b1 /fs
parent8d936bb13ce788c616084ab1a5754da3490a9f0c (diff)
parentc1e9735975c05d36ca97e9d39e9b06c3e0b3b0d7 (diff)
parent9debfb81e7654fe7388a49f45bc4d789b94c1103 (diff)
parent7daaa06357bf7f1874b62bb1ea9d66a51d4e567e (diff)
parent38748bcb940e8b52beee19b0e5cfd740475a99e1 (diff)
Merge branches 'acpi-scan', 'acpi-misc', 'acpi-button' and 'acpi-dptf'
* acpi-scan: ACPI: scan: Fix acpi_dma_configure_id() kerneldoc name * acpi-misc: ACPI: GED: fix -Wformat ACPI: Fix whitespace inconsistencies * acpi-button: ACPI: button: Add DMI quirk for Medion Akoya E2228T * acpi-dptf: ACPI: DPTF: Support Alder Lake