From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 9 Apr 2021 16:25:31 +0000 (-0700)
Subject: Merge tag 'acpi-5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Tag: v5.12-rc7~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ccd6c35c72c771616c37d1978e02a982da0678ef;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'acpi-5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull ACPI fix from Rafael Wysocki:
 "Fix a build issue introduced by a previous fix in the ACPI processor
  driver (Vitaly Kuznetsov)"

* tag 'acpi-5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: processor: Fix build when CONFIG_ACPI_PROCESSOR=m
---

ccd6c35c72c771616c37d1978e02a982da0678ef