Module Name: src
Committed By: christos
Date: Tue Oct 15 16:13:40 UTC 2019
Modified Files:
src/sys/external/bsd/acpica/dist/compiler: aslcompile.c aslcompiler.h
aslerror.c aslfiles.c aslload.c asloptions.c aslsupport.l
aslutils.c aslwalks.c aslxref.c dtcompile.c dtcompilerparser.y
dtfield.c
src/sys/external/bsd/acpica/dist/debugger: dbinput.c dbmethod.c
src/sys/external/bsd/acpica/dist/events: evxface.c
src/sys/external/bsd/acpica/dist/executer: exconfig.c exdump.c
src/sys/external/bsd/acpica/dist/include: acglobal.h aclocal.h
acnamesp.h acpiosxf.h acpixf.h actypes.h acutils.h
src/sys/external/bsd/acpica/dist/namespace: nsaccess.c nsdump.c
nseval.c nsinit.c nsrepair2.c
src/sys/external/bsd/acpica/dist/tables: tbdata.c tbxfload.c
src/sys/external/bsd/acpica/dist/tools/acpidump: apfiles.c
src/sys/external/bsd/acpica/dist/utilities: utdebug.c utosi.c
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/sys/external/bsd/acpica/dist/compiler/aslcompile.c
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h \
src/sys/external/bsd/acpica/dist/compiler/aslload.c \
src/sys/external/bsd/acpica/dist/compiler/aslxref.c
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/acpica/dist/compiler/aslerror.c \
src/sys/external/bsd/acpica/dist/compiler/aslwalks.c
cvs rdiff -u -r1.13 -r1.14 \
src/sys/external/bsd/acpica/dist/compiler/aslfiles.c \
src/sys/external/bsd/acpica/dist/compiler/aslsupport.l \
src/sys/external/bsd/acpica/dist/compiler/dtcompile.c \
src/sys/external/bsd/acpica/dist/compiler/dtfield.c
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/acpica/dist/compiler/asloptions.c
cvs rdiff -u -r1.23 -r1.24 \
src/sys/external/bsd/acpica/dist/compiler/aslutils.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/acpica/dist/compiler/dtcompilerparser.y
cvs rdiff -u -r1.18 -r1.19 \
src/sys/external/bsd/acpica/dist/debugger/dbinput.c
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/acpica/dist/debugger/dbmethod.c
cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/acpica/dist/events/evxface.c
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/acpica/dist/executer/exconfig.c
cvs rdiff -u -r1.13 -r1.14 src/sys/external/bsd/acpica/dist/executer/exdump.c
cvs rdiff -u -r1.19 -r1.20 \
src/sys/external/bsd/acpica/dist/include/acglobal.h \
src/sys/external/bsd/acpica/dist/include/aclocal.h \
src/sys/external/bsd/acpica/dist/include/actypes.h \
src/sys/external/bsd/acpica/dist/include/acutils.h
cvs rdiff -u -r1.16 -r1.17 \
src/sys/external/bsd/acpica/dist/include/acnamesp.h
cvs rdiff -u -r1.13 -r1.14 \
src/sys/external/bsd/acpica/dist/include/acpiosxf.h
cvs rdiff -u -r1.22 -r1.23 src/sys/external/bsd/acpica/dist/include/acpixf.h
cvs rdiff -u -r1.17 -r1.18 \
src/sys/external/bsd/acpica/dist/namespace/nsaccess.c
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/acpica/dist/namespace/nsdump.c \
src/sys/external/bsd/acpica/dist/namespace/nseval.c
cvs rdiff -u -r1.16 -r1.17 \
src/sys/external/bsd/acpica/dist/namespace/nsinit.c
cvs rdiff -u -r1.13 -r1.14 \
src/sys/external/bsd/acpica/dist/namespace/nsrepair2.c
cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/acpica/dist/tables/tbdata.c
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/acpica/dist/tables/tbxfload.c
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/acpica/dist/tools/acpidump/apfiles.c
cvs rdiff -u -r1.16 -r1.17 \
src/sys/external/bsd/acpica/dist/utilities/utdebug.c
cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/acpica/dist/utilities/utosi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
