OSDN Git Service

Merge tag 'pnp-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Nov 2021 23:21:27 +0000 (16:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Nov 2021 23:21:27 +0000 (16:21 -0700)
commit464fddbba1dfbc219f1e9145127a482d2159dee5
treece8d512f3b8af6145b7cdb732dec5d788dc78628
parentf73cd9c951a9dc23f0ee1260fef5cc61d2825fb3
parent47e9249a6cc78c2856bdc8c2f8bd495309cbc060
Merge tag 'pnp-5.16-rc1' of git://git./linux/kernel/git/rafael/linux-pm

Pull PNP update from Rafael Wysocki:
 "Fix a comment incorrectly marked as kernel-doc (Randy Dunlap)"

* tag 'pnp-5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PNP: system.c: unmark a comment as being kernel-doc