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

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

* acpi-apei:
  ACPI: APEI: remove redundant assignment to variable rc

* acpi-video:
  ACPI: video: use native backlight for GA401/GA502/GA503
parents 864a3f48 c3f2311e 2dfbacc6
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