Module Name: src
Committed By: christos
Date: Sat Dec 14 16:56:34 UTC 2019
Modified Files:
src/sys/external/bsd/acpica/dist/common: dmtables.c
src/sys/external/bsd/acpica/dist/compiler: aslanalyze.c aslcompile.c
aslerror.c aslfiles.c aslload.c asloptions.c aslprepkg.c aslutils.c
aslxref.c dtcompile.c dtcompilerparser.y dtfield.c
src/sys/external/bsd/acpica/dist/debugger: dbdisply.c dbinput.c
dbmethod.c dbnames.c
src/sys/external/bsd/acpica/dist/disassembler: dmresrc.c dmwalk.c
src/sys/external/bsd/acpica/dist/dispatcher: dscontrol.c dsopcode.c
src/sys/external/bsd/acpica/dist/events: evregion.c evrgnini.c
src/sys/external/bsd/acpica/dist/hardware: hwxfsleep.c
src/sys/external/bsd/acpica/dist/include: acdebug.h acpixf.h acutils.h
src/sys/external/bsd/acpica/dist/namespace: nsdump.c nsxfname.c
src/sys/external/bsd/acpica/dist/tables: tbdata.c tbxfload.c
src/sys/external/bsd/acpica/dist/utilities: uttrack.c
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/acpica/dist/common/dmtables.c
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/acpica/dist/compiler/aslanalyze.c
cvs rdiff -u -r1.17 -r1.18 \
src/sys/external/bsd/acpica/dist/compiler/aslcompile.c
cvs rdiff -u -r1.13 -r1.14 \
src/sys/external/bsd/acpica/dist/compiler/aslerror.c
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/acpica/dist/compiler/aslfiles.c \
src/sys/external/bsd/acpica/dist/compiler/dtcompile.c \
src/sys/external/bsd/acpica/dist/compiler/dtfield.c
cvs rdiff -u -r1.15 -r1.16 \
src/sys/external/bsd/acpica/dist/compiler/aslload.c \
src/sys/external/bsd/acpica/dist/compiler/aslxref.c
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/acpica/dist/compiler/asloptions.c \
src/sys/external/bsd/acpica/dist/compiler/aslprepkg.c
cvs rdiff -u -r1.24 -r1.25 \
src/sys/external/bsd/acpica/dist/compiler/aslutils.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/acpica/dist/compiler/dtcompilerparser.y
cvs rdiff -u -r1.15 -r1.16 \
src/sys/external/bsd/acpica/dist/debugger/dbdisply.c
cvs rdiff -u -r1.19 -r1.20 \
src/sys/external/bsd/acpica/dist/debugger/dbinput.c
cvs rdiff -u -r1.13 -r1.14 \
src/sys/external/bsd/acpica/dist/debugger/dbmethod.c
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/acpica/dist/debugger/dbnames.c
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/acpica/dist/disassembler/dmresrc.c \
src/sys/external/bsd/acpica/dist/disassembler/dmwalk.c
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/acpica/dist/dispatcher/dscontrol.c
cvs rdiff -u -r1.13 -r1.14 \
src/sys/external/bsd/acpica/dist/dispatcher/dsopcode.c
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/acpica/dist/events/evregion.c
cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/acpica/dist/events/evrgnini.c
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/acpica/dist/hardware/hwxfsleep.c
cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/acpica/dist/include/acdebug.h
cvs rdiff -u -r1.23 -r1.24 src/sys/external/bsd/acpica/dist/include/acpixf.h
cvs rdiff -u -r1.20 -r1.21 src/sys/external/bsd/acpica/dist/include/acutils.h
cvs rdiff -u -r1.16 -r1.17 \
src/sys/external/bsd/acpica/dist/namespace/nsdump.c
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/acpica/dist/namespace/nsxfname.c
cvs rdiff -u -r1.13 -r1.14 src/sys/external/bsd/acpica/dist/tables/tbdata.c
cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/acpica/dist/tables/tbxfload.c
cvs rdiff -u -r1.17 -r1.18 \
src/sys/external/bsd/acpica/dist/utilities/uttrack.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
