Module Name: src
Committed By: christos
Date: Sat Aug 18 14:17:56 UTC 2018
Modified Files:
src/sys/external/bsd/acpica/dist/compiler: aslload.c asloptions.c
src/sys/external/bsd/acpica/dist/debugger: dbinput.c dbmethod.c
dbnames.c
src/sys/external/bsd/acpica/dist/executer: exconfig.c
src/sys/external/bsd/acpica/dist/hardware: hwregs.c hwsleep.c
hwxfsleep.c
src/sys/external/bsd/acpica/dist/include: acdisasm.h acexcep.h
aclocal.h acnamesp.h acoutput.h acpixf.h acutils.h
src/sys/external/bsd/acpica/dist/namespace: nsaccess.c nsdump.c
nseval.c nsinit.c
src/sys/external/bsd/acpica/dist/tables: tbdata.c
src/sys/external/bsd/acpica/dist/utilities: utdelete.c
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/acpica/dist/compiler/aslload.c
cvs rdiff -u -r1.7 -r1.8 \
src/sys/external/bsd/acpica/dist/compiler/asloptions.c
cvs rdiff -u -r1.15 -r1.16 \
src/sys/external/bsd/acpica/dist/debugger/dbinput.c
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/acpica/dist/debugger/dbmethod.c \
src/sys/external/bsd/acpica/dist/debugger/dbnames.c
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/acpica/dist/executer/exconfig.c
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/acpica/dist/hardware/hwregs.c
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/acpica/dist/hardware/hwsleep.c
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/acpica/dist/hardware/hwxfsleep.c
cvs rdiff -u -r1.16 -r1.17 \
src/sys/external/bsd/acpica/dist/include/acdisasm.h \
src/sys/external/bsd/acpica/dist/include/aclocal.h
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/acpica/dist/include/acexcep.h
cvs rdiff -u -r1.13 -r1.14 \
src/sys/external/bsd/acpica/dist/include/acnamesp.h
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/acpica/dist/include/acoutput.h
cvs rdiff -u -r1.19 -r1.20 src/sys/external/bsd/acpica/dist/include/acpixf.h
cvs rdiff -u -r1.17 -r1.18 src/sys/external/bsd/acpica/dist/include/acutils.h
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/acpica/dist/namespace/nsaccess.c \
src/sys/external/bsd/acpica/dist/namespace/nsinit.c
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/acpica/dist/namespace/nsdump.c
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/acpica/dist/namespace/nseval.c
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/acpica/dist/tables/tbdata.c
cvs rdiff -u -r1.1.1.10 -r1.2 \
src/sys/external/bsd/acpica/dist/utilities/utdelete.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
