Merge tag 'pnp-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Oct 2020 18:50:01 +0000 (11:50 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Oct 2020 18:50:01 +0000 (11:50 -0700)
commitdefb53a7c790f9e37a765de8a5d830ed15e2055b
treeaf21162a303cb194bf041aae9c65519e8feb4423
parentcf1d2b44f6c701ffff58606b5b8a8996190d6e7d
parent2ef0342530b0f487a65b5f6c94c85dce5f9b53b5
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