diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-24 11:17:32 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-24 11:17:32 -0700 |
commit | ea1f9163ac83fa537f58e00a81028844702279e4 (patch) | |
tree | e2c969f01e37203f0cbe27e18cf6527a73fab86f /fs/binfmt_elf.c | |
parent | 1b7eaf570140281a1aa898a875aa587d48d96958 (diff) | |
parent | 12064c1768439fa0882547010afae6b52aafa7af (diff) |
Merge tag 'acpi-5.15-rc3' of git://git.kernel.org/pub/scm/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()"
Diffstat (limited to 'fs/binfmt_elf.c')
0 files changed, 0 insertions, 0 deletions