summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-12-15 15:29:30 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2020-12-15 15:29:30 +0100
commitb85195b7ec9d5d2bb2b0039586c955f49fc2e6ee (patch)
tree122215f27aced0ce8e9b34585e3cef5e6ca4a34e /drivers/acpi
parent25417185e9b5ff90746d50769d2a3fcd1629e254 (diff)
parent6d5acf38183937ee31e9aafe91af4ac74b2d1907 (diff)
parent91438aebcd56ed3cfa480e4546c7b06e9db3c73c (diff)
downloadlinux-b85195b7ec9d5d2bb2b0039586c955f49fc2e6ee.tar.bz2
Merge branches 'acpica' and 'acpi-scan'
* acpica: ACPICA: Update version to 20201113 ACPICA: Interpreter: fix memory leak by using existing buffer ACPICA: Add function trace macros to improve debugging ACPICA: Also handle "orphan" _REG methods for GPIO OpRegions ACPICA: Remove extreaneous "the" in comments ACPICA: Add 5 new UUIDs to the known UUID table * acpi-scan: ACPI: scan: Fix up _DEP-related terminology with supplier/consumer ACPI: scan: Drop INT3396 from acpi_ignore_dep_ids[] ACPI: scan: Add PNP0D80 to the _DEP exceptions list ACPI: scan: Call acpi_get_object_info() from acpi_add_single_object() ACPI: scan: Add acpi_info_matches_hids() helper