From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 3 Oct 2022 18:16:28 +0000 (+0200)
Subject: Merge branch 'pnp'
X-Git-Tag: block-6.1-2022-13-10~109^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=c8efe77f23d508d62e232de612e739dbf4da4659;p=linux-2.6-block.git

Merge branch 'pnp'

Merge a PNP changes for 6.1-rc1:

  - Drop unused pnpid32_to_pnpid() declaration from  PNP code (Gaosheng
    Cui).

* pnp:
  PNPBIOS: remove unused pnpid32_to_pnpid() declaration
---

c8efe77f23d508d62e232de612e739dbf4da4659