CVS commit: src/sys/external/bsd/acpica/dist

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Mon May 25 23:19:28 UTC 2020

Modified Files:
        src/sys/external/bsd/acpica/dist/compiler: aslcompiler.l aslload.c
            aslpredef.c aslxref.c dtutils.c
        src/sys/external/bsd/acpica/dist/disassembler: dmbuffer.c
        src/sys/external/bsd/acpica/dist/include: acglobal.h acpixf.h

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
    src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l
cvs rdiff -u -r1.17 -r1.18 \
    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/aslpredef.c
cvs rdiff -u -r1.14 -r1.15 \
    src/sys/external/bsd/acpica/dist/compiler/dtutils.c
cvs rdiff -u -r1.11 -r1.12 \
    src/sys/external/bsd/acpica/dist/disassembler/dmbuffer.c
cvs rdiff -u -r1.21 -r1.22 \
    src/sys/external/bsd/acpica/dist/include/acglobal.h
cvs rdiff -u -r1.25 -r1.26 src/sys/external/bsd/acpica/dist/include/acpixf.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.