Merge tag 'acpi-5.12-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Apr 2021 16:25:31 +0000 (09:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 9 Apr 2021 16:25:31 +0000 (09:25 -0700)
commitccd6c35c72c771616c37d1978e02a982da0678ef
tree12ab764a9c0deca1010bd75a6beb1e6d90962a29
parent895915226a598394fe9bf57fe97612bdfcb2fb86
parentfa26d0c778b432d3d9814ea82552e813b33eeb5c
Merge tag 'acpi-5.12-rc7' of git://git./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