]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge remote-tracking branch 'devicetree/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 05:05:51 +0000 (15:05 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 05:05:51 +0000 (15:05 +1000)
commit29807c7f13a83d7c4966b89ff18a6bb6c63d55b9
tree544953a236b42b71ccd8c34f6ab89096a5ff0c16
parent0b2d28940043fb3f9ae8fa61dab25f4836d7615a
parent56ddc4cd4c8f9d65c0ac5544df4645376b327cbc
Merge remote-tracking branch 'devicetree/for-next'

# Conflicts:
# drivers/of/of_net.c
16 files changed:
Documentation/devicetree/bindings/Makefile
Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml
Documentation/devicetree/bindings/arm/cpus.yaml
Documentation/devicetree/bindings/input/input.yaml
Documentation/devicetree/bindings/sound/renesas,rsnd.yaml
Documentation/devicetree/bindings/submitting-patches.rst
Documentation/devicetree/bindings/trivial-devices.yaml
Documentation/devicetree/bindings/vendor-prefixes.yaml
arch/arm64/Kconfig
arch/powerpc/Kconfig
drivers/of/address.c
drivers/of/fdt.c
drivers/of/overlay.c
drivers/of/property.c
scripts/Makefile.lib
scripts/checkpatch.pl