From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 24 Feb 2021 19:27:18 +0000 (-0800)
Subject: Merge tag 'rpmsg-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson... 
X-Git-Tag: v5.12-rc1~42
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=e40242b9820817a7afe520228c6a6a535e40d222;p=linux-block.git

Merge tag 'rpmsg-v5.12' of git://git./linux/kernel/git/andersson/remoteproc

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
---

e40242b9820817a7afe520228c6a6a535e40d222