Module Name: src
Committed By: christos
Date: Sun Nov 12 03:02:36 UTC 2017
Modified Files:
src/sys/external/bsd/acpica/dist/common: dmtbdump.c dmtbinfo.c
src/sys/external/bsd/acpica/dist/compiler: aslcompile.c aslcompiler.h
aslcompiler.l aslerror.c aslfiles.c aslload.c aslopt.c asloptions.c
aslsupport.l aslutils.c dtcompile.c dtfield.c dtparser.y
dtsubtable.c dttable.c dtutils.c prparser.y prutils.c
src/sys/external/bsd/acpica/dist/debugger: dbexec.c dbinput.c
src/sys/external/bsd/acpica/dist/dispatcher: dscontrol.c dsutils.c
src/sys/external/bsd/acpica/dist/events: evregion.c
src/sys/external/bsd/acpica/dist/include: acapps.h acdebug.h acdisasm.h
acexcep.h aclocal.h acmacros.h acnamesp.h acpixf.h actbl1.h
actypes.h acutils.h
src/sys/external/bsd/acpica/dist/namespace: nsaccess.c
src/sys/external/bsd/acpica/dist/tools/acpixtract: acpixtract.c
src/sys/external/bsd/acpica/dist/utilities: utdecode.c utmutex.c
uttrack.c
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/acpica/dist/common/dmtbdump.c
cvs rdiff -u -r1.14 -r1.15 src/sys/external/bsd/acpica/dist/common/dmtbinfo.c
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/acpica/dist/compiler/aslcompile.c
cvs rdiff -u -r1.9 -r1.10 \
src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h \
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 \
src/sys/external/bsd/acpica/dist/compiler/dttable.c \
src/sys/external/bsd/acpica/dist/compiler/dtutils.c
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l \
src/sys/external/bsd/acpica/dist/compiler/dtparser.y \
src/sys/external/bsd/acpica/dist/compiler/prparser.y
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/acpica/dist/compiler/aslerror.c \
src/sys/external/bsd/acpica/dist/compiler/aslload.c \
src/sys/external/bsd/acpica/dist/compiler/prutils.c
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/acpica/dist/compiler/aslopt.c
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/acpica/dist/compiler/asloptions.c
cvs rdiff -u -r1.18 -r1.19 \
src/sys/external/bsd/acpica/dist/compiler/aslutils.c
cvs rdiff -u -r1.7 -r1.8 \
src/sys/external/bsd/acpica/dist/compiler/dtsubtable.c
cvs rdiff -u -r1.13 -r1.14 src/sys/external/bsd/acpica/dist/debugger/dbexec.c \
src/sys/external/bsd/acpica/dist/debugger/dbinput.c
cvs rdiff -u -r1.8 -r1.9 \
src/sys/external/bsd/acpica/dist/dispatcher/dscontrol.c
cvs rdiff -u -r1.9 -r1.10 \
src/sys/external/bsd/acpica/dist/dispatcher/dsutils.c
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/acpica/dist/events/evregion.c
cvs rdiff -u -r1.11 -r1.12 src/sys/external/bsd/acpica/dist/include/acapps.h \
src/sys/external/bsd/acpica/dist/include/acnamesp.h \
src/sys/external/bsd/acpica/dist/include/actbl1.h
cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/acpica/dist/include/acdebug.h
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/acpica/dist/include/acdisasm.h \
src/sys/external/bsd/acpica/dist/include/aclocal.h
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/acpica/dist/include/acexcep.h
cvs rdiff -u -r1.13 -r1.14 \
src/sys/external/bsd/acpica/dist/include/acmacros.h \
src/sys/external/bsd/acpica/dist/include/actypes.h
cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/acpica/dist/include/acpixf.h
cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/acpica/dist/include/acutils.h
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/acpica/dist/namespace/nsaccess.c
cvs rdiff -u -r1.8 -r1.9 \
src/sys/external/bsd/acpica/dist/tools/acpixtract/acpixtract.c
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/acpica/dist/utilities/utdecode.c
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/acpica/dist/utilities/utmutex.c
cvs rdiff -u -r1.13 -r1.14 \
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.
