Merge tag 'acpi-5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 Oct 2021 15:45:46 +0000 (08:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 16 Oct 2021 15:45:46 +0000 (08:45 -0700)
Pull ACPI fix from Rafael Wysocki:
 "Add a missing device ID to a quirk list in the suspend-to-idle support
  code"

* tag 'acpi-5.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: PM: Include alternate AMDI0005 id in special behaviour


Trivial merge