Merge tag 'acpi-5.12-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Apr 2021 17:53:39 +0000 (10:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Apr 2021 17:53:39 +0000 (10:53 -0700)
commit7e25f40eab52c57ff6772d27d2aef3640a3237d7
treed666f40cc2789bf1f9fb9922b019d834500b9bf2
parent33f0d9d94a0ef0814d23320c2536c4135d230114
parent6998a8800d73116187aad542391ce3b2dd0f9e30
Merge tag 'acpi-5.12-rc8' of git://git./linux/kernel/git/rafael/linux-pm

Pull ACPI fix from Rafael Wysocki:
 "Restore the initrd-based ACPI table override functionality broken by
  one of the recent fixes"

* tag 'acpi-5.12-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: x86: Call acpi_boot_table_init() after acpi_table_upgrade()