Merge tag 'devprop-5.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Jan 2021 23:45:47 +0000 (15:45 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 8 Jan 2021 23:45:47 +0000 (15:45 -0800)
commit78d42025e5bb83f9071e4a60edf1567dd12ed9dc
treec44988fa594998d4a896eb7f336693afbe30769f
parentfb9ca0be63b49eece304f50023e736a678cc4159
parent3f7bddaf5d5a83aa2eb1e6d72db221d3ec43c813
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"