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

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

Module Name:    src
Committed By:   jmcneill
Date:           Sat May 25 11:48:05 UTC 2019

Modified Files:
        src/sys/external/gpl2/dts/dist/arch/arm/boot/dts: bcm2835-rpi.dtsi
            bcm283x.dtsi sun8i-a23-ippo-q8h-v1.2.dts sun8i-a23-ippo-q8h-v5.dts
        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/amlogic:
            meson-gx.dtsi meson-gxbb.dtsi meson-gxl.dtsi
        src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/arm:
            vexpress-v2m-rs1.dtsi
        src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/rockchip:
            rk3328-rock64.dts
        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:
            qcom-apq8064-arrow-sd-600eval-pins.dtsi
            qcom-apq8064-arrow-sd-600eval.dts skeleton.dtsi skeleton64.dtsi

Log Message:
Merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
    src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/bcm2835-rpi.dtsi
cvs rdiff -u -r1.6 -r1.7 \
    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/qcom-apq8064-arrow-sd-600eval-pins.dtsi \
    src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/skeleton.dtsi \
    src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/skeleton64.dtsi
cvs rdiff -u -r1.1.1.3 -r0 \
    src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts
cvs rdiff -u -r1.3 -r1.4 \
    src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v1.2.dts \
    src/sys/external/gpl2/dts/dist/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts
cvs rdiff -u -r1.4 -r1.5 \
    src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
cvs rdiff -u -r1.5 -r1.6 \
    src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
cvs rdiff -u -r1.2 -r1.3 \
    src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-gx.dtsi \
    src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi \
    src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi
cvs rdiff -u -r1.4 -r1.5 \
    src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/arm/vexpress-v2m-rs1.dtsi
cvs rdiff -u -r1.2 -r1.3 \
    src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
cvs rdiff -u -r1.7 -r1.8 \
    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.