From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 8 Jan 2021 23:45:47 +0000 (-0800)
Subject: Merge tag 'devprop-5.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael... 
X-Git-Tag: v5.11-rc3~19
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=78d42025e5bb83f9071e4a60edf1567dd12ed9dc;p=linux-2.6-block.git

Merge tag 'devprop-5.11-rc3' of git://git./linux/kernel/git/rafael/linux-pm

Pull device properties framework fixes from Rafael Wysocki:
 "Revert a problematic commit that went in during the 5.10 cycle and
  improve the kerneldoc description of the function affected by it (both
  changes from Bard Liao)"

* tag 'devprop-5.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  device property: add description of fwnode cases
  Revert "device property: Keep secondary firmware node secondary by type"
---

78d42025e5bb83f9071e4a60edf1567dd12ed9dc