From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 13 Sep 2011 03:39:53 +0000 (-0700)
Subject: Merge branch 'acpi' of git://github.com/lenb/linux
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~20647
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=2f4d3218e95d48de2951dcf2bea619ea49ef93de;p=mirror_ubuntu-focal-kernel.git

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
---

2f4d3218e95d48de2951dcf2bea619ea49ef93de