From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 14 Oct 2020 18:50:01 +0000 (-0700)
Subject: Merge tag 'pnp-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Tag: v5.15~2696
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=defb53a7c790f9e37a765de8a5d830ed15e2055b;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'pnp-5.10-rc1' of git://git./linux/kernel/git/rafael/linux-pm

Pull PNP updates from Rafael Wysocki:
 "These clean the PNP code somewhat:

   - Remove the now unused pnp_find_card() function (Christoph Hellwig)

   - Drop duplicate pci.h include from the quirks code and add an
     "internal.h" include to acpi_pnp.c to fix a compiler warning (Tian
     Tao)"

* tag 'pnp-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PNP: remove the now unused pnp_find_card() function
  PNP: ACPI: Fix missing-prototypes in acpi_pnp.c
  PNP: quirks: Fix duplicate included pci.h
---

defb53a7c790f9e37a765de8a5d830ed15e2055b