Skip to content
Commit 47a8e798 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-apei' and 'acpi-docs' into linux-next 

* acpi-apei:
  ACPI: APEI: Fix missing ERST record id

* acpi-docs:
  ACPI: docs: enumeration: Unify Package () for properties (part 2)
parents 216ba262 a0909315 e802ca75
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment