Merge tag 'acpi-5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Mar 2021 20:32:17 +0000 (12:32 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 5 Mar 2021 20:32:17 +0000 (12:32 -0800)
commitea6be461cbedefaa881711a43f2842aabbd12fd4
tree5952d3156e3a1cba245bccda6cf7096f864d6d2c
parentfc2c8d0af05af4c380824e40ff99ede398913ae5
parentff70784ab9f89e78e67d5d172bf7644de673f61f
Merge tag 'acpi-5.12-rc2' of git://git./linux/kernel/git/rafael/linux-pm

Pull ACPI fix from Rafael Wysocki:
 "Make the empty stubs of some helper functions used when CONFIG_ACPI is
  not set actually match those functions (Andy Shevchenko)"

* tag 'acpi-5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: bus: Constify is_acpi_node() and friends (part 2)