Merge tag 'pnp-5.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Oct 2020 20:00:10 +0000 (13:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Oct 2020 20:00:10 +0000 (13:00 -0700)
commitd2c4d6e8acc6548a3ddae0f2e8d8120ead09ad80
tree881c5376098affc93a9a21d69389deb38dcc013e
parenta5a16050d78dd4a8a5a2a6614e64f76d59ef8a2e
parente510785f8aca4a7346497edd4d5aceefe5370960
Merge tag 'pnp-5.10-rc2' of git://git./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