Skip to content
Commit 0cb3b79e authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-apei' 

* acpi-apei:
  ACPI: APEI: Fix BERT resources conflict with ACPI NVS area
parents 43e31e40 41139ac3
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