From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 24 Sep 2021 18:17:32 +0000 (-0700)
Subject: Merge tag 'acpi-5.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ea1f9163ac83fa537f58e00a81028844702279e4;p=linux.git

Merge tag 'acpi-5.15-rc3' of git://git./linux/kernel/git/rafael/linux-pm

Pull ACPI fix from Rafael Wysocki:
 "Revert a recent commit related to memory management that turned out to
  be problematic (Jia He)"

* tag 'acpi-5.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  Revert "ACPI: Add memory semantics to acpi_os_map_memory()"
---

ea1f9163ac83fa537f58e00a81028844702279e4