Skip to content
Commit 2f4d3218 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'acpi' of git://github.com/lenb/linux

* 'acpi' of git://github.com/lenb/linux:
  acpica: ACPI_MAX_SLEEP should be 2 sec, not 20
  ACPI APEI: Add Kconfig option IRQ_WORK for GHES
  PNP: update pnp.debug usage (needs value on command line)
  APEI: Fix WHEA _OSC call
parents d9543314 38c0a0c9
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment