From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 30 Oct 2020 20:00:10 +0000 (-0700)
Subject: Merge tag 'pnp-5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2c4d6e8acc6548a3ddae0f2e8d8120ead09ad80;p=people%2Fms%2Flinux.git

Merge tag 'pnp-5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull PNP fix from Rafael Wysocki:
 "Make function names in kerneldoc comments match the actual names of
  the functions that they correspond to (Mauro Carvalho Chehab)"

* tag 'pnp-5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PNP: fix kernel-doc markups
---

d2c4d6e8acc6548a3ddae0f2e8d8120ead09ad80