Merge tag 'rpmsg-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Feb 2021 19:27:18 +0000 (11:27 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 24 Feb 2021 19:27:18 +0000 (11:27 -0800)
Pull rpmsg updates from Bjorn Andersson:
 "Fix two build issues in the GLINK driver and correct some kerneldoc in
  the same"

* tag 'rpmsg-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc:
  rpmsg: glink: add include of header file
  rpmsg: glink: Guard qcom_glink_ssr_notify() with correct config
  rpmsg: glink: fix some kerneldoc comments


Trivial merge