Module Name: src
Committed By: skrll
Date: Thu Jun 8 16:00:40 UTC 2017
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: .gitignore .travis.yml
src/external/gpl2/dtc/dist/libfdt: Makefile.libfdt TODO fdt.c fdt.h
fdt_addresses.c fdt_empty_tree.c fdt_ro.c fdt_rw.c fdt_strerror.c
fdt_sw.c fdt_wip.c libfdt.h libfdt_env.h libfdt_internal.h
version.lds
src/external/gpl2/dtc/dist/tests: test_tree1_body.dtsi
Log Message:
Merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 src/external/gpl2/dtc/dist/.gitignore \
src/external/gpl2/dtc/dist/.travis.yml
cvs rdiff -u -r1.2 -r1.3 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/flattree.c src/external/gpl2/dtc/dist/srcpos.c \
src/external/gpl2/dtc/dist/util.h
cvs rdiff -u -r1.1.1.1 -r0 src/external/gpl2/dtc/dist/libfdt/Makefile.libfdt \
src/external/gpl2/dtc/dist/libfdt/TODO \
src/external/gpl2/dtc/dist/libfdt/fdt.c \
src/external/gpl2/dtc/dist/libfdt/fdt.h \
src/external/gpl2/dtc/dist/libfdt/fdt_addresses.c \
src/external/gpl2/dtc/dist/libfdt/fdt_empty_tree.c \
src/external/gpl2/dtc/dist/libfdt/fdt_ro.c \
src/external/gpl2/dtc/dist/libfdt/fdt_rw.c \
src/external/gpl2/dtc/dist/libfdt/fdt_strerror.c \
src/external/gpl2/dtc/dist/libfdt/fdt_sw.c \
src/external/gpl2/dtc/dist/libfdt/fdt_wip.c \
src/external/gpl2/dtc/dist/libfdt/libfdt.h \
src/external/gpl2/dtc/dist/libfdt/libfdt_env.h \
src/external/gpl2/dtc/dist/libfdt/libfdt_internal.h \
src/external/gpl2/dtc/dist/libfdt/version.lds
cvs rdiff -u -r1.2 -r1.3 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/test_tree1_body.dtsi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
