Module Name: src
Committed By: christos
Date: Fri Sep 13 23:13:25 UTC 2024
Modified Files:
src/sys/external/bsd/acpica/dist/common: dmtables.c dmtbdump.c
src/sys/external/bsd/acpica/dist/compiler: aslcompile.c aslcompiler.h
aslcompiler.l aslfiles.c asloptions.c dtfield.c dtutils.c prutils.c
src/sys/external/bsd/acpica/dist/debugger: dbnames.c
src/sys/external/bsd/acpica/dist/disassembler: dmwalk.c
src/sys/external/bsd/acpica/dist/executer: exsystem.c
src/sys/external/bsd/acpica/dist/hardware: hwxfsleep.c
src/sys/external/bsd/acpica/dist/include: acdisasm.h acglobal.h
aclocal.h acoutput.h acpixf.h actbl1.h actypes.h
src/sys/external/bsd/acpica/dist/include/platform: acgcc.h
src/sys/external/bsd/acpica/dist/resources: rsdump.c
src/sys/external/bsd/acpica/dist/tables: tbfadt.c tbutils.c
src/sys/external/bsd/acpica/dist/tools/acpixtract: acpixtract.c
src/sys/external/bsd/acpica/dist/utilities: utdebug.c utdelete.c
utosi.c
Log Message:
Merge conflicts between 20230628 and 20240827
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/acpica/dist/common/dmtables.c
cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/acpica/dist/common/dmtbdump.c
cvs rdiff -u -r1.23 -r1.24 \
src/sys/external/bsd/acpica/dist/compiler/aslcompile.c
cvs rdiff -u -r1.21 -r1.22 \
src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h \
src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l \
src/sys/external/bsd/acpica/dist/compiler/dtfield.c
cvs rdiff -u -r1.20 -r1.21 \
src/sys/external/bsd/acpica/dist/compiler/aslfiles.c
cvs rdiff -u -r1.17 -r1.18 \
src/sys/external/bsd/acpica/dist/compiler/asloptions.c
cvs rdiff -u -r1.22 -r1.23 \
src/sys/external/bsd/acpica/dist/compiler/dtutils.c
cvs rdiff -u -r1.16 -r1.17 \
src/sys/external/bsd/acpica/dist/compiler/prutils.c
cvs rdiff -u -r1.17 -r1.18 \
src/sys/external/bsd/acpica/dist/debugger/dbnames.c
cvs rdiff -u -r1.16 -r1.17 \
src/sys/external/bsd/acpica/dist/disassembler/dmwalk.c
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/acpica/dist/executer/exsystem.c
cvs rdiff -u -r1.18 -r1.19 \
src/sys/external/bsd/acpica/dist/hardware/hwxfsleep.c
cvs rdiff -u -r1.27 -r1.28 \
src/sys/external/bsd/acpica/dist/include/acdisasm.h \
src/sys/external/bsd/acpica/dist/include/acglobal.h
cvs rdiff -u -r1.25 -r1.26 src/sys/external/bsd/acpica/dist/include/aclocal.h
cvs rdiff -u -r1.17 -r1.18 \
src/sys/external/bsd/acpica/dist/include/acoutput.h
cvs rdiff -u -r1.35 -r1.36 src/sys/external/bsd/acpica/dist/include/acpixf.h
cvs rdiff -u -r1.22 -r1.23 src/sys/external/bsd/acpica/dist/include/actbl1.h
cvs rdiff -u -r1.29 -r1.30 src/sys/external/bsd/acpica/dist/include/actypes.h
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/acpica/dist/include/platform/acgcc.h
cvs rdiff -u -r1.17 -r1.18 \
src/sys/external/bsd/acpica/dist/resources/rsdump.c
cvs rdiff -u -r1.20 -r1.21 src/sys/external/bsd/acpica/dist/tables/tbfadt.c
cvs rdiff -u -r1.22 -r1.23 src/sys/external/bsd/acpica/dist/tables/tbutils.c
cvs rdiff -u -r1.17 -r1.18 \
src/sys/external/bsd/acpica/dist/tools/acpixtract/acpixtract.c
cvs rdiff -u -r1.21 -r1.22 \
src/sys/external/bsd/acpica/dist/utilities/utdebug.c
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/acpica/dist/utilities/utdelete.c
cvs rdiff -u -r1.19 -r1.20 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.
