CVS commit: src/sys/external/gpl2/dts/dist/arch

["Jared D. McNeill" <jmcneill%netbsd.org@localhost>]

Module Name:    src
Committed By:   jmcneill
Date:           Wed Jun 27 16:32:14 UTC 2018

Modified Files:
        src/sys/external/gpl2/dts/dist/arch/arm/boot/dts: bcm2835-rpi.dtsi
            bcm283x.dtsi
        src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner:
            sun50i-h6-pine-h64.dts sun50i-h6.dtsi
        src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/arm:
            vexpress-v2m-rs1.dtsi
Removed Files:
        src/sys/external/gpl2/dts/dist/arch/arm/boot/dts: exynos5440-sd5v1.dts
            exynos5440-ssdk5440.dts exynos5440-tmu-sensor-conf.dtsi
            exynos5440-trip-points.dtsi exynos5440.dtsi
            ste-ccu8540-pinctrl.dtsi ste-ccu8540.dts ste-ccu9540.dts
        src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/marvell:
            berlin4ct-dmp.dts berlin4ct-stb.dts berlin4ct.dtsi

Log Message:
Merge conflicts.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
    src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi \
    src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm283x.dtsi
cvs rdiff -u -r1.1.1.2 -r0 \
    src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos5440-sd5v1.dts \
    src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos5440-tmu-sensor-conf.dtsi \
    src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos5440-trip-points.dtsi
cvs rdiff -u -r1.1.1.3 -r0 \
    src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos5440-ssdk5440.dts
cvs rdiff -u -r1.1.1.5 -r0 \
    src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/exynos5440.dtsi
cvs rdiff -u -r1.1.1.1 -r0 \
    src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi \
    src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/ste-ccu8540.dts \
    src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/ste-ccu9540.dts
cvs rdiff -u -r1.2 -r1.3 \
    src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts \
    src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
cvs rdiff -u -r1.3 -r1.4 \
    src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/arm/vexpress-v2m-rs1.dtsi
cvs rdiff -u -r1.1.1.1 -r0 \
    src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts \
    src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/marvell/berlin4ct-stb.dts
cvs rdiff -u -r1.1.1.2 -r0 \
    src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/marvell/berlin4ct.dtsi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.