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

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

Module Name:    src
Committed By:   jmcneill
Date:           Sat Apr 28 18:28:26 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/include/dt-bindings/input:
            linux-event-codes.h
Removed Files:
        src/sys/external/gpl2/dts/dist/arch/arm/boot/dts:
            cloudengines-pogoplug-series-3.dts imx6qdl-microsom-ar8035.dtsi
            imx6qdl-microsom.dtsi imx7d-pico.dts samsung_k3pe0e000b.dtsi
            wd-mbwe.dts
        src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/marvell:
            armada-cp110-master.dtsi armada-cp110-slave.dtsi

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
    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.1 -r0 \
    src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/cloudengines-pogoplug-series-3.dts \
    src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/imx6qdl-microsom.dtsi \
    src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/wd-mbwe.dts
cvs rdiff -u -r1.1.1.2 -r0 \
    src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi \
    src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/imx7d-pico.dts \
    src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/samsung_k3pe0e000b.dtsi
cvs rdiff -u -r1.1.1.4 -r0 \
    src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi \
    src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
cvs rdiff -u -r1.5 -r1.6 \
    src/sys/external/gpl2/dts/dist/include/dt-bindings/input/linux-event-codes.h

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