From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 5 Mar 2021 20:32:17 +0000 (-0800)
Subject: Merge tag 'acpi-5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Tag: v5.15~1588
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ea6be461cbedefaa881711a43f2842aabbd12fd4;p=platform%2Fkernel%2Flinux-starfive.git

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)
---

ea6be461cbedefaa881711a43f2842aabbd12fd4