Module Name: src
Committed By: skrll
Date: Sun Dec 22 12:38:24 UTC 2019
Modified Files:
src/external/gpl2/dtc/dist: data.c dtc-lexer.l dtc-parser.y dtc.h
fdtdump.c fdtput.c flattree.c srcpos.c util.h
src/external/gpl2/dtc/dist/tests: mangle-layout.c move_and_save.c
tests.h
Removed Files:
src/external/gpl2/dtc/dist/tests: mangle-layout.supp open_pack.supp
sw_tree1.supp tests.sh
Log Message:
Merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/dtc/dist/data.c \
src/external/gpl2/dtc/dist/dtc-lexer.l \
src/external/gpl2/dtc/dist/dtc-parser.y src/external/gpl2/dtc/dist/dtc.h \
src/external/gpl2/dtc/dist/fdtdump.c src/external/gpl2/dtc/dist/fdtput.c \
src/external/gpl2/dtc/dist/srcpos.c src/external/gpl2/dtc/dist/util.h
cvs rdiff -u -r1.4 -r1.5 src/external/gpl2/dtc/dist/flattree.c
cvs rdiff -u -r1.3 -r1.4 src/external/gpl2/dtc/dist/tests/mangle-layout.c \
src/external/gpl2/dtc/dist/tests/move_and_save.c \
src/external/gpl2/dtc/dist/tests/tests.h
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/gpl2/dtc/dist/tests/mangle-layout.supp \
src/external/gpl2/dtc/dist/tests/open_pack.supp \
src/external/gpl2/dtc/dist/tests/sw_tree1.supp \
src/external/gpl2/dtc/dist/tests/tests.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
