Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Jan 2022 23:07:29 +0000 (10:07 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 17 Jan 2022 23:07:29 +0000 (10:07 +1100)
commit87c48599f67413fcb1d0702c31fc8371d92059d3
tree2cafc97e1441bf6444d5fe7018c0e820aa15c58f
parent8e59a140352a5b40a97eb1a1579eefc20de90429
parentd8adf5b92a9d2205620874d498c39923ecea8749
Merge branch 'for-next' of git://git./linux/kernel/git/robh/linux.git

# Conflicts:
# Documentation/devicetree/bindings/vendor-prefixes.yaml
Documentation/devicetree/bindings/trivial-devices.yaml
Documentation/devicetree/bindings/vendor-prefixes.yaml