CVS commit: src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner

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

Module Name:    src
Committed By:   jmcneill
Date:           Wed Jun 27 16:44:38 UTC 2018

Modified Files:
        src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner:
            sun50i-h6.dtsi

Log Message:
Fix merge problem.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
    src/sys/external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi

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