From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 24 Oct 2019 19:49:32 +0000 (-0400)
Subject: Merge tag 'acpi-5.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7f65d3541676a9f0e27f6545c6f53367fd248f7b;p=android-x86%2Fkernel.git

Merge tag 'acpi-5.4-rc5' of git://git./linux/kernel/git/rafael/linux-pm

Pull ACPI fix from Rafael Wysocki:
 "Fix locking issue in the error code path of a function that belongs to
  the sysfs interface exposed by the ACPI NFIT handling code (Dan
  Carpenter)"

* tag 'acpi-5.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI: NFIT: Fix unlock on error in scrub_show()
---

7f65d3541676a9f0e27f6545c6f53367fd248f7b