summaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2024-01-05 19:24:33 -0800
committerDan Williams <dan.j.williams@intel.com>2024-01-05 19:24:33 -0800
commite16bf7e015d75fdd805528bedaf285fcb71dad2a (patch)
treee5ec5f22bc582951752565ddf260cd4c89b95bee /drivers/acpi
parent80dda9a69a487c72ded1ac69234c8a89d5922b04 (diff)
parent5459e186a5c9f412334321cff58d70dcb0e48a04 (diff)
Merge branch 'for-6.7/cxl' into for-6.8/cxl
Pick up a late locking change + fixup that is better as merge window material than rc material.
Diffstat (limited to 'drivers/acpi')
0 files changed, 0 insertions, 0 deletions